Issue #836