Bug: 13238 Fix sorting.