fix bugs'