Fix sorting, again