Issue #1005