ok, fix collisions