Fixed a bug cause Michael said to