Fix collisions;