Spawning fix
Merge branch 'pim'