diff --git a/SubRenamer/Helper/I18NHelper.cs b/SubRenamer/Helper/I18NHelper.cs
index cee6454..9c5747e 100644
--- a/SubRenamer/Helper/I18NHelper.cs
+++ b/SubRenamer/Helper/I18NHelper.cs
@@ -18,7 +18,6 @@ public static string GetLanguageNameFromOs()
     {
         string tz = TimeZoneInfo.Local.Id.ToLower();
         
-        // FIXME: `CultureInfo.CurrentCulture.Name` always return `null` in AvaloniaUI
         var name = CultureInfo.CurrentCulture.Name;
         if (string.IsNullOrWhiteSpace(name)) name = Environment.GetEnvironmentVariable("LANG");
 
diff --git a/SubRenamer/SubRenamer.csproj b/SubRenamer/SubRenamer.csproj
index 97e1abb..85c2376 100644
--- a/SubRenamer/SubRenamer.csproj
+++ b/SubRenamer/SubRenamer.csproj
@@ -11,7 +11,8 @@
         <TrimMode>link</TrimMode>
         <PublishTrimmed>true</PublishTrimmed>
         <SelfContained>true</SelfContained>
-        <InvariantGlobalization>true</InvariantGlobalization>
+        <!-- ICU database is required to execute NFKC for japanese -->
+        <InvariantGlobalization>false</InvariantGlobalization>
         <StripSymbols>true</StripSymbols>
         <NoWarn>IL2057;IL2026;IL2104;IL3053</NoWarn>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
diff --git a/SubRenamer/ViewModels/ConflictViewModel.cs b/SubRenamer/ViewModels/ConflictViewModel.cs
index 570cc6b..a16d233 100644
--- a/SubRenamer/ViewModels/ConflictViewModel.cs
+++ b/SubRenamer/ViewModels/ConflictViewModel.cs
@@ -38,7 +38,7 @@ public ConflictViewModel(List<string> options)
     
     private static Dictionary<string, string> GetFriendlyOptionsDictionary(IEnumerable<string> options)
     {
-        // var lang2Info = CultureInfo.GetCultures(CultureTypes.NeutralCultures).ToDictionary(c => c.Name, c => c);
+        // var lang2Info = CultureInfo.GetCultures(CultureTypes.NeutralCultures).ToDictionary(c => c.NativeName, c => c);
 
         var dict = new Dictionary<string, string>();
         foreach (var k in options)