collisions bug fixed