(Issue 1257)