Another Spawn fix