Repair bugs in last version