bug #840 - corrections