Fixed respawning