(Issue 1032)