(Issue 1213)