fixed issue 1673