fix some bugs

some bugs