diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa4fa14c1..3d5370473 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,6 +44,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -105,6 +106,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -164,6 +166,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -223,6 +226,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -282,6 +286,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -341,6 +346,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -403,8 +409,8 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git pull || tr
-            ue
+            git checkout ${CIRCLE_BRANCH} || true
+            git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
             export OMR_FEED_SRC="${CIRCLE_BRANCH:-$CIRCLE_TAG}"
@@ -462,6 +468,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
+            git checkout ${CIRCLE_BRANCH} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -499,7 +506,6 @@ jobs:
           no_output_timeout: 40m
           command: |
             cd ~/openmptcprouter/
-            git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
             export OMR_FEED_SRC="${CIRCLE_BRANCH:-$CIRCLE_TAG}"
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 643c0c519..eefe4f0da 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -779,9 +779,9 @@ _config_service() {
 			if [ "$vps_aes" != "false" ]; then
 				logger -t "OMR-VPS" "CPU support AES, set it by default"
 				uci -q batch <<-EOF >/dev/null
-					set glorytun.vpn.chacha20=0
+					set glorytun.vpn.chacha20="0"
 					commit glorytun
-					set shadowsocks-libev.sss0.method=aes-256-gcm
+					set shadowsocks-libev.sss0.method="aes-256-gcm"
 					commit shadowsocks-libev
 				EOF
 			fi