Fixing the CDI