Fixed issue MMCMS-187