Fixed respawning

* Fixes #1103