062413 #2

Fixed collisions