Correct conditions that check for cdi enablement