fix some bugs
fix some bug