Fixed sorting to be numerical