Fix for CMSMS 2.2.x