fix some new bug