Sorting now fixed