Modify some bug