issue #794