Issue #1125