Corrected bug #5908 and tested (thanks Klenkes) under CMSMS 1.9.4.2.