Fixed a bug cause Nick said to