fix some bugs
fix bug