fix some bugs'