diff --git a/common/movement.tf b/common/movement.tf
index 49c8e3d..eb197e8 100644
--- a/common/movement.tf
+++ b/common/movement.tf
@@ -57,6 +57,9 @@
 /def walkcmd = \
   /if ({1} =~ "off")\
     /set dowalkcmd=0%;\
+    /set walkcmd=none%;\
+  /elseif ({1} =~ "")\
+    /echo -p #@{C%c_info}#@{n}# walkcmd: @{C%c_info}%{walkcmd}@{n}%;\
   /else \
     /set dowalkcmd=1%;\
     /set walkcmd=%*%;\
@@ -83,7 +86,7 @@
   /set lwlast=%{1} %;\
   /send %{1} %;\
     /if ({dowalkcmd} =~ "1")\
-      /send %walkcmd%;\
+      %walkcmd%;\
     /endif%;\
   /hide off %;\
   /_map_go navigate:%{1}%;\
@@ -95,7 +98,7 @@
   /set lwlast=%{1} %;\
   /send przemknij %{1} %;\
     /if ({dowalkcmd} =~ "1")\
-      /send %walkcmd%;\
+      %walkcmd%;\
     /endif%;\
   /hide on %;\
   /_map_go navigate:%{1}%;\
@@ -107,7 +110,7 @@
   /set lwlast=%{1} %;\
   /send przemknij sie z druzyna %{1} %;\
     /if ({dowalkcmd} =~ "1")\
-      /send %walkcmd%;\
+      %walkcmd%;\
     /endif%;\
   /hide on %;\
   /_map_go navigate:%{1}%;\
diff --git a/common/sets.tf b/common/sets.tf
index 58281eb..0f76a92 100644
--- a/common/sets.tf
+++ b/common/sets.tf
@@ -13,6 +13,7 @@
 /set auto=off
 /set unnormal=none
 /set dowalkcmd=0
+/set walkcmd=none
 
 /set ownkills=0
 /set allkills=0