fix some bugs .