diff --git a/rel/files/vm.args b/rel/files/vm.args
index ba46d02f9..6db0b253c 100644
--- a/rel/files/vm.args
+++ b/rel/files/vm.args
@@ -1,5 +1,5 @@
 ## Name of the node
--name emqtt@127.0.0.1
+-sname emqtt
 
 ## Cookie for distributed erlang
 -setcookie emqtt
diff --git a/src/emqtt_ctl.erl b/src/emqtt_ctl.erl
index 94404393b..fc8f5d002 100644
--- a/src/emqtt_ctl.erl
+++ b/src/emqtt_ctl.erl
@@ -22,8 +22,9 @@ cluster_info([]) ->
     Nodes = [node()|nodes()],
     ?PRINT("cluster nodes: ~p~n", [Nodes]).
 
-cluster([Node]) ->
-	case net_adm:ping(list_to_atom(Node)) of
+cluster([SNode]) ->
+	Node = list_to_atom(SNode),
+	case net_adm:ping(Node) of
 	pong ->
 		application:stop(emqtt),
 		mnesia:stop(),