Fixed a bug cause Dimitris said to