Collision detection seems to be working now