(Issue 1599)