Remove sort order fix