Issue #994