updates for issue #972