Issue 1604

proposed to fix for #1604 with test