Fix annoying sort order