Fix collisions