further updates for issue #707