diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90ebd1e5b..21d45174c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,7 +317,7 @@ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
 add_custom_target(pot
     COMMAND xgettext --keyword=L --from-code=UTF-8 --debug
         -f "${L10N_DIR}/list.txt"
-        -o "${L10N_DIR}/Slic3rPE.pot"
+        -o "${L10N_DIR}/Slic3r++.pot"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Generate pot file from strings in the source tree"
 )
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 10445592b..ab54ee105 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -134,6 +134,7 @@ bool GUI_App::OnInit()
     });
 
     load_language();
+    //wxSetlocale(LC_NUMERIC, "C");
 
     // Suppress the '- default -' presets.
     preset_bundle->set_default_suppressed(app_config->get("no_defaults") == "1");
@@ -419,7 +420,7 @@ bool GUI_App::select_language(  wxArrayString & names,
 		m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
         m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3r++");
 		//FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
-		wxSetlocale(LC_NUMERIC, "C");
+		//wxSetlocale(LC_NUMERIC, "C");
         Preset::update_suffix_modified();
 		m_imgui->set_language(m_wxLocale->GetCanonicalName().ToUTF8().data());
         return true;
@@ -445,10 +446,10 @@ bool GUI_App::load_language()
         {
             m_wxLocale = new wxLocale;
             m_wxLocale->Init(identifiers[i]);
-			m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
+            m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
             m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3r++");
 			//FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
-            wxSetlocale(LC_NUMERIC, "C");
+            //wxSetlocale(LC_NUMERIC, "C");
 			Preset::update_suffix_modified();
 			m_imgui->set_language(m_wxLocale->GetCanonicalName().ToUTF8().data());
             return true;
@@ -638,6 +639,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
                 save_language();
                 show_info(mainframe->m_tabpanel, _(L("Application will be restarted")), _(L("Attention!")));
                 _3DScene::remove_all_canvases();// remove all canvas before recreate GUI
+                //wxSetlocale(LC_NUMERIC, "C");
                 recreate_GUI();
             }
             break;