Issue #1121