Issue #1004