Bug fixed and update