Fixing litle bug