Fixed a bug cause Sarah said to