Fixed a bug cause Jordan said to