Issue #983