Issue #979