Sorting fixed, and working as in production