(Issue 1270)