Collisions fix attempts...