collision bug fix