Issue #996