fixed cml compatibility