fix some bugs
fix bugs