Fixed collisions issues

Collisions issues fixed