ENH:fix some bugs
ENH:fix some bugs