#1218: Fixing multi-column sort