Issue #843