Fixed a bug cause Jason said to