diff --git a/arkadia/combat.tf b/arkadia/combat.tf
index 925b19b..d54d807 100644
--- a/arkadia/combat.tf
+++ b/arkadia/combat.tf
@@ -45,7 +45,9 @@
     /echo -p @{C%c_alarm}>>> Wskazano cie jako cel obrony! <<<@{n} %;\
     /echo %;\
   /else \
-    /if (regmatch('dosiadajac.*', {matched}))\
+    /if ({matched} =~ "siebie")\
+      /set cel_obrony=%ogolne_leader_bie%;\
+    /elseif (regmatch('dosiadajac.*', {matched}))\
       /set cel_obrony=$[replace({P0}, '', {matched})]%;\
     /else \
       /set cel_obrony=%matched%;\
diff --git a/common/movement.tf b/common/movement.tf
index 5c6010d..4bb09c7 100644
--- a/common/movement.tf
+++ b/common/movement.tf
@@ -80,17 +80,17 @@
 	/status%;\
 	/checkgo
 
-/def -mregexp -Fp2 -t'podazasz .*za .* na (.*)\\.' ide_za_kims = \
-	/if ({P1} =~ "polnoc" )				/set lwlast=n%;\
-	/elseif ({P1} =~ "poludnie" )			/set lwlast=s%;\
-	/elseif ({P1} =~ "zachod" )				/set lwlast=w%;\
-	/elseif ({P1} =~ "wschod" )				/set lwlast=e%;\
-	/elseif ({P1} =~ "polnocny-zachod" )	/set lwlast=nw%;\
-	/elseif ({P1} =~ "polnocny-wschod" )	/set lwlast=ne%;\
-	/elseif ({P1} =~ "poludniowy-zachod" )	/set lwlast=sw%;\
-	/elseif ({P1} =~ "poludniowy-wschod" )	/set lwlast=se%;\
-	/elseif ({P1} =~ "gore" )				/set lwlast=u%;\
-	/elseif ({P1} =~ "dol" )				/set lwlast=d%;\
+/def -mregexp -Fp2 -t'(Ruszasz .* na (.*)|podazasz .*za .* na (.*))\\.' ide_za_kims = \
+	/if ({P2} =~ "polnoc" )				/set lwlast=n%;\
+	/elseif ({P2} =~ "poludnie" )			/set lwlast=s%;\
+	/elseif ({P2} =~ "zachod" )				/set lwlast=w%;\
+	/elseif ({P2} =~ "wschod" )				/set lwlast=e%;\
+	/elseif ({P2} =~ "polnocny-zachod" )	/set lwlast=nw%;\
+	/elseif ({P2} =~ "polnocny-wschod" )	/set lwlast=ne%;\
+	/elseif ({P2} =~ "poludniowy-zachod" )	/set lwlast=sw%;\
+	/elseif ({P2} =~ "poludniowy-wschod" )	/set lwlast=se%;\
+	/elseif ({P2} =~ "gore" )				/set lwlast=u%;\
+	/elseif ({P2} =~ "dol" )				/set lwlast=d%;\
 	/else									/set lwlast=X%;\
 	/endif