Fix massive respawn bug v2 (mention #13)