Issue #1136