Issue 1592