fixed issue 3585,3586