Fixed a bug cause Chris said to