(Issue 1141)