Prepare better version for  mac
Fix collision bug when is same (work for simple collision)