bugfix by zhuofeng