Fix grade ordering.