(Issue 1129)