Issue #1057