fix xidashen found bugs