Issue #1031