Initial sort order fix