Fixed a bug cause Jiang said to