Sorting fix finished