Issue #1211