diff --git a/dist/server/daemon/start.sh.in b/dist/server/daemon/start.sh.in
index 6c73cf8..271b58a 100644
--- a/dist/server/daemon/start.sh.in
+++ b/dist/server/daemon/start.sh.in
@@ -10,24 +10,6 @@ shell_ret=0
 
 cd "$DAEMON_PATH"
 
-if [ $SRV == all ] || [ $SRV == core ] ; then
-	echo -n "starting teleport core server ... "
-	result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
-	if [ $result -gt 0 ]; then
-		echo "already running, skip."
-	else
-		$DAEMON_PATH/bin/tp_core start
-
-		result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
-		if [ ! $result -gt 0 ]; then
-			echo -e "\e[31m[FAILED]\033[0m"
-			shell_ret=1
-		else
-			echo -e "\e[32m[done]\033[0m"
-		fi
-	fi
-fi
-
 if [ $SRV == all ] || [ $SRV == web ] ; then
 	echo -n "starting teleport web ... "
 	result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l )
@@ -46,6 +28,24 @@ if [ $SRV == all ] || [ $SRV == web ] ; then
 	fi
 fi
 
+if [ $SRV == all ] || [ $SRV == core ] ; then
+	echo -n "starting teleport core server ... "
+	result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
+	if [ $result -gt 0 ]; then
+		echo "already running, skip."
+	else
+		$DAEMON_PATH/bin/tp_core start
+
+		result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
+		if [ ! $result -gt 0 ]; then
+			echo -e "\e[31m[FAILED]\033[0m"
+			shell_ret=1
+		else
+			echo -e "\e[32m[done]\033[0m"
+		fi
+	fi
+fi
+
 exit $shell_ret
 
 
diff --git a/dist/server/daemon/status.sh.in b/dist/server/daemon/status.sh.in
index 22a0455..ef1e26b 100644
--- a/dist/server/daemon/status.sh.in
+++ b/dist/server/daemon/status.sh.in
@@ -3,14 +3,6 @@
 DAEMON_PATH={daemon_path}
 shell_ret=0
 
-result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
-if [ $result -gt 0 ]; then
-	echo -e "teleport core server is \e[32mrunning\033[0m."
-else
-	echo -e "teleport core server is \e[31mnot running\033[0m."
-	shell_ret=1
-fi
-
 result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l )
 if [ $result -gt 0 ]; then
 	echo -e "teleport web server is \e[32mrunning\033[0m."
@@ -19,5 +11,13 @@ else
 	shell_ret=1
 fi
 
+result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
+if [ $result -gt 0 ]; then
+	echo -e "teleport core server is \e[32mrunning\033[0m."
+else
+	echo -e "teleport core server is \e[31mnot running\033[0m."
+	shell_ret=1
+fi
+
 exit $shell_ret
 
diff --git a/dist/server/daemon/stop.sh.in b/dist/server/daemon/stop.sh.in
index 434533c..4b83ecf 100644
--- a/dist/server/daemon/stop.sh.in
+++ b/dist/server/daemon/stop.sh.in
@@ -7,17 +7,6 @@ fi
 
 DAEMON_PATH={daemon_path}
 
-if [ $SRV == all ] || [ $SRV == core ] ; then
-	echo -n "stoping teleport core server ... "
-	result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
-	if [ $result -gt 0 ]; then
-		ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | kill `awk '{{print $1}}'`
-		echo 'done.'
-	else
-		echo "not running, skip."
-	fi
-fi
-
 if [ $SRV == all ] || [ $SRV == web ] ; then
 	echo -n "stoping teleport web ... "
 	result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l )
@@ -29,5 +18,16 @@ if [ $SRV == all ] || [ $SRV == web ] ; then
 	fi
 fi
 
+if [ $SRV == all ] || [ $SRV == core ] ; then
+	echo -n "stoping teleport core server ... "
+	result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
+	if [ $result -gt 0 ]; then
+		ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | kill `awk '{{print $1}}'`
+		echo 'done.'
+	else
+		echo "not running, skip."
+	fi
+fi
+
 exit 0