fix fix collisions