Fixed a bug cause Hanlle said to