Issue #965