(Issue 1045)