Fixed for modern versions of CMSMS (where modern == 1.7 series)