updates for issue #639