Fix to work with CMSMS 1.6