Issue #1126