Select order fix