by qianjun;fix bugs
by qianjun;fix bugs