Fix the sort order