Bug fix for mistake in merge