modify some bug