fix mistake in pablo's merge