fix some bugs for tuong