Fixed sorting!