Fixed a merge mistake.