Issue #1101