Issue 1798