(Issue 1033)