Fixed sorting again.