Issue #1132