(Issue 1024)