Issue #1128