updates for issue #996