fixed issue 1690