(Issue 1607)