updates for issue #586