Issue #1060