--- a/share/hedgewars/Data/Maps/Knockball/map.lua	Wed Mar 24 11:01:21 2010 +0000
+++ b/share/hedgewars/Data/Maps/Knockball/map.lua	Wed Mar 24 14:03:03 2010 +0000
@@ -57,7 +57,7 @@
 end
 
 function onGameTick()
-	if ball ~= nil then FollowGear(ball) end
+	if ball ~= nil and GetFollowGear() ~= nil then FollowGear(ball) end
 end
 
 function onAmmoStoreInit()
@@ -72,6 +72,7 @@
 			CopyPV2(gear, ball)
 			SetState(ball, 0x200) -- temporary - might change!
 			SetTag(ball, 8) -- baseball skin
+			FollowGear(ball)
 		end
 	end
 end