fix some bugs
fix the bugs