Issue #997
Issue #971