BUG:fix some bugs
BUG:fix some bugs