Issue #961