Fix from fips branch.