Issue #1122