Fixed a bug cause Steve said to