Issue #1076