Fixed a bug cause Steven said to