modify bugs, now is ok