wanghao:modfiy bug issue-18