work on bugs 823097, 961431 and 917227