--- a/hedgewars/GSHandlers.inc	Mon Jun 04 21:15:24 2007 +0000
+++ b/hedgewars/GSHandlers.inc	Mon Jun 04 21:29:05 2007 +0000
@@ -1199,7 +1199,7 @@
    th:= CurrentTeam^.CurrHedgehog;
    repeat
      CurrentTeam^.CurrHedgehog:= Succ(CurrentTeam^.CurrHedgehog) mod (cMaxHHIndex + 1);
-   until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) or (Gear^.Pos = th);
+   until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) or (CurrentTeam^.CurrHedgehog = th);
 
    HHGear:= CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear;
    HHGear^.State:= State;