Bugfix for CMSMS 2.x