(Issue 1489)