Fixed the Endless loop in case of a Zombie tail