fix some bugs2