Bug fix for collisions
Faster find function