fix bugs in last commmit