cherrypicked lexisnexis fix