fix bugs
fix bugs
finish bug fix