sort_order fix