fixed bug and update