Fix in the matching for records