Issue #1081