[FIX] Account for non-migrated fields