fixed collisions problem