Issue #1054