Issue #1140