remove some bugs