Issue #1142