Fixed the sorting... again I guess.