Fix spawning