Issue #960