Fix respawning (again)