fix collisions further