FIX: Fix orig_fid_str