Fixed collisions finally