More for CMO-3518 fix