Fixed a code merge problem.