Issue #974