fix collisions