(Issue 1526)