(Issue 1050)