(Issue 1061)