Issue #1137