Fixed spawn order problem