Fixed a mistake in the merge.