collision bug fix,