Collision detection should be a little more robust