(Issue 1247)