Change implementation of SortingCriterion