Markku/Spigot's fix for the Zombie lag of 1.6, further tweaked by me