issue #836