Issue #1035