Fixed the sort order