Issue #1078