Fix the fix.

Needed to make sure all field names are unique.