Fix sorting... again