Fixed a bug cause Todd said to