fixed collisions