issue #791