Fix instant respawn problem

Fix instant respawn problem