Issue 17.4