Fixed collisions again