Issue #1072