Fix respawning (worked but rarely, now it should work 100% as expected)