update: fixed collisions