Issue #1011