Fix last merge issue.