fix collision bug