please fix some bugs...