Issue #1082