Issue #1024