All CI_Base fix.