Bugs fixs

Bug fixed