Issue #1006