Issue #1073