fixed issue 1590