fix some collisions