(Issue 1666)