More tweaks on collison