fix collisions bug