updates for issue #964