(Issue 1767)