fix bug by xincheng