Sorting should be fixed now