(Issue 1007)