--- a/hedgewars/HHHandlers.inc	Sat Nov 19 14:30:58 2011 -0500
+++ b/hedgewars/HHHandlers.inc	Sat Nov 19 15:34:38 2011 -0500
@@ -1093,7 +1093,7 @@
     begin
     if Gear^.Timer = 0 then
         begin
-        Gear^.State:= Gear^.State and not (gstWait or gstLoser or gstWinner or gstAttacked or gstNotKickable);
+        Gear^.State:= Gear^.State and not (gstWait or gstLoser or gstWinner or gstAttacked or gstNotKickable or gstHHChooseTarget);
         Gear^.Active:= false;
         AddGearCI(Gear);
         exit