diff -r ed417e912267 -r f8c453ade379 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sun May 20 10:45:16 2012 -0400
+++ b/hedgewars/GSHandlers.inc	Sun May 20 10:55:58 2012 -0400
@@ -5490,7 +5490,14 @@
             gY:= hwRound(Y);
             if Target.X = NoPointX then t:= hwRound(hwSqr(X-HHGear^.X)+hwSqr(Y-HHGear^.Y));
             if Target.X <> NoPointX then
+                begin
+                if (abs(gX-Target.X) < 2) and (abs(gY-Target.Y) < 2) then
+                    begin
+                    X:= HHGear^.X;
+                    Y:= HHGear^.Y
+                    end;
                 inc(Pos)
+                end
             else if (gY > cWaterLine) or
                     (((gX and LAND_WIDTH_MASK = 0) and (gY and LAND_HEIGHT_MASK = 0))
                         and ((Land[gY, gX] and $FF00 and not lfIce <> 0) or