work on bugs 917227 and 961431