Another potential fix for spawning