#2679 fix for cms3