Issue #1021