fix the some bugs