some fix bugs