Fixed spawning (hopefully)