Fixup ordering issue.