Issue #993