(Issue 1488)