Issue #971