issue #831