(Issue 1035)