Fixed auto-respawn