BestHandFinder fix