Fixed a bug cause Andy said to