fix collisions!