(Issue 1358)