Issue #973