fixed hongchao's comments