fixing some collisions