Issue #1043