Issue #1074