Fixing sort order