Issue #981