Collision bug fix