Fixed spawning and wrapping