Issue #1062