Sorting Issue Fixed