Issue #970