Fix ordering issue.