Added possible fix for repeated respawn