Issue 1607