fix bugs;