Fixed mistake in previous merge