(Issue 1496)