updates for issue #651