(Issue 1010)