Fix re-ordering.