bug fixes<br />Not tested in CMSMS 2.0