Issue #962