Fixing sort key