fix some bugs 2