CORE-309 - Slight mistake in the logic.