fix for the CMO