(Issue 1670)