Fix sorting again