Issue #1026