Issue 1645