fix for field names that include '_'