Issue #991