Fix in SpawnCommand