fix some bug
fix bugs