(Issue 1178)