Issue #1037