issue 1592 fix