Issue #1025