Fixed for CMSMS 1.8.x and CMSMS 1.9