issue #793