(Issue 1012)