Issue #1124