Fix for not spawning right