fix bugs:wq