hopefully fix collision detection