(Issue 1018)