diff --git a/arkadia/substitute.tf b/arkadia/substitute.tf
index cae36f0..19e8cec 100644
--- a/arkadia/substitute.tf
+++ b/arkadia/substitute.tf
@@ -105,7 +105,7 @@
     /let _ktobije=%{PR}%;\
   /endif%;\
   /if ({P1} =~"Jestes")\
-    /return substitute(strcat("[", decode_attr({_enemy_count}, {zc_bold}), "] ", {PL}, decode_attr("### TY ### ", {zc_bold}), {P2}, ". ", "<<<<<", {_ktobije}))%;\
+    /return substitute(strcat("[", decode_attr({_enemy_count}, {zc_crit}), "] ", {PL}, decode_attr("### TY ### ", {zc_bold}), {P2}, ". ", decode_attr("<<<<<", {zc_crit}), {_ktobije}))%;\
   /else \
     /return substitute(strcat("[", decode_attr({_enemy_count}, {zc_bold}), "] ", {PL}, {P1}, " ", {P2}, ". ", "<<<<<", {_ktobije}))%;\
   /endif
diff --git a/common/substitute.tf b/common/substitute.tf
index 98677db..76c9e03 100644
--- a/common/substitute.tf
+++ b/common/substitute.tf
@@ -13,9 +13,10 @@
   typo_%{1} = /send $$[strcat ({PL}, '%{param2}', replace('%{param1}', '%{param2}', {PR}))]
 
 /def -mregexp -Fp2 -t'(przybywaja|podazaja) (z(e|)|na) [wzpgd]' _liczenie_teamow = \
-  /let _ile=%{PL} %; \
-  /let _ile=$[replace("##", " ", replace(" ", "_",replace(", ", "##", replace(" i ", "##", {_ile}))))]%; \
-  /podlicz_team %{_ile}%; \
+  /unset _il_wr%;\
+  /let _ile=%{PL} %;\
+  /let _ile=$[replace("##", " ", replace(" ", "_",replace(", ", "##", replace(" i ", "##", {_ile}))))]%;\
+  /podlicz_team %{_ile}%;\
   /return substitute(strcat("[", decode_attr({_il_wr}, {zc_bold}), "] ", {PL}, {P0}, {PR}))%;\
   /unset _il_wr