[Zhenghan] bug fixed
[Zhenghan] bug fixed