Fixed the sort