issue #790