Issue #1041