Issue #1109