Issue #1059