Collisions finally fixed?