Issue #997