Issue #1061