Issue #1001