fix a bug
fix some bugs