Issue #1055