Issue 1754