Issue #1138