(Issue 1532)