Fixed spawn logic