Fixed a mistake in a previous merge