Fixed sorting, once again.