Fixed sorting!
Fixed Sorting