Issue #1144