(Issue 1008)