CMSMS 1.11 compatibility - thanks to leeroybrun & postiffm for their assistance.