Bugfix for version CMSMS 2.x