Fix to sort order