Spawn fix