fix bug
merger with zhenghao