Correct unit spawn