fix some bugs(may be bug)