--- a/hedgewars/uGearsHandlersMess.pas	Sat Apr 08 21:48:39 2017 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Thu May 12 16:20:17 2016 +0200
@@ -4395,6 +4395,9 @@
             if not ((Gear^.dX*ox + Gear^.dY*oy).isNegative) then
                 continue;
 
+        if iterator^.Kind = gtDuck then
+            iterator^.Pos:= 0;
+
         isbullet:= (iterator^.Kind in [gtShotgunShot, gtDEagleShot, gtSniperRifleShot, gtSineGunShot]);
 
         r:= int2hwFloat(iterator^.Radius);
@@ -6374,9 +6377,7 @@
             if Gear^.dY > _0_4 then
                 PlaySound(sndDuckWater);
             Gear^.Pos:= 1;
-            Gear^.Timer:= Gear^.WDTimer;
             Gear^.dY:= _0;
-            Gear^.State:= Gear^.State or gstNoGravity;
             end;
         end