Minor fix for CMSMS v2.3