Fix mismatched ordering