Issue #1129