Issue #861