diff --git a/common/common.cpp b/common/common.cpp
index a4c0e965cf..9a6ec3d951 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -66,9 +66,9 @@ LOCALE_IO::LOCALE_IO()
     if( m_c_count++ == 0 )
     {
         // Store the user locale name, to restore this locale later, in dtor
-        m_user_locale = setlocale( LC_ALL, 0 );
+        m_user_locale = setlocale( LC_NUMERIC, nullptr );
         // Switch the locale to C locale, to read/write files with fp numbers
-        setlocale( LC_ALL, "C" );
+        setlocale( LC_NUMERIC, "C" );
     }
 }
 
@@ -79,7 +79,7 @@ LOCALE_IO::~LOCALE_IO()
     if( --m_c_count == 0 )
     {
         // revert to the user locale
-        setlocale( LC_ALL, m_user_locale.c_str() );
+        setlocale( LC_NUMERIC, m_user_locale.c_str() );
     }
 }
 
diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 117fbde534..c95c855f8c 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -831,7 +831,7 @@ bool PGM_BASE::SetLanguage( bool first_time )
     if( result != dtst )
         // string to double encode/decode does not work! Bug detected:
         // Disable floating point localization:
-        setlocale( LC_ALL, "C" );
+        setlocale( LC_NUMERIC, "C" );
 
     if( !m_locale->IsLoaded( dictionaryName ) )
         m_locale->AddCatalog( dictionaryName );