Fixed spawn different locations issues