Fixed a bug cause Warun said to