(Issue 1017)