Collision bug fixed