Fixed a merge issue.