Fixed missing sort order