Fix issue #793