diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp
index 351b1c91d..438565449 100644
--- a/src/Nazara/Core/String.cpp
+++ b/src/Nazara/Core/String.cpp
@@ -15,6 +15,7 @@
 #include <cstdio>
 #include <cstring>
 #include <limits>
+#include <locale>
 #include <sstream>
 #include <Utfcpp/utf8.h>
 #include <Nazara/Core/Debug.hpp>
@@ -5121,6 +5122,7 @@ namespace Nz
 	String String::Number(float number)
 	{
 		std::ostringstream oss;
+		oss.imbue(std::locale::classic());
 		oss.precision(NAZARA_CORE_DECIMAL_DIGITS);
 		oss << number;
 
@@ -5137,6 +5139,7 @@ namespace Nz
 	String String::Number(double number)
 	{
 		std::ostringstream oss;
+		oss.imbue(std::locale::classic());
 		oss.precision(NAZARA_CORE_DECIMAL_DIGITS);
 		oss << number;
 
@@ -5153,6 +5156,7 @@ namespace Nz
 	String String::Number(long double number)
 	{
 		std::ostringstream oss;
+		oss.imbue(std::locale::classic());
 		oss.precision(NAZARA_CORE_DECIMAL_DIGITS);
 		oss << number;
 
diff --git a/src/Nazara/Renderer/GlslWriter.cpp b/src/Nazara/Renderer/GlslWriter.cpp
index 06ebc251d..3d023993c 100644
--- a/src/Nazara/Renderer/GlslWriter.cpp
+++ b/src/Nazara/Renderer/GlslWriter.cpp
@@ -233,19 +233,19 @@ namespace Nz
 				break;
 
 			case ShaderAst::ExpressionType::Float1:
-				Append(String::Format("%F", node.values.vec1));
+				Append(String::Number(node.values.vec1));
 				break;
 
 			case ShaderAst::ExpressionType::Float2:
-				Append(String::Format("vec2(%F, %F)", node.values.vec2.x, node.values.vec2.y));
+				Append("vec2(" + String::Number(node.values.vec2.x) + ", " + String::Number(node.values.vec2.y) + ")");
 				break;
 
 			case ShaderAst::ExpressionType::Float3:
-				Append(String::Format("vec3(%F, %F, %F)", node.values.vec3.x, node.values.vec3.y, node.values.vec3.z));
+				Append("vec3(" + String::Number(node.values.vec3.x) + ", " + String::Number(node.values.vec3.y) + ", " + String::Number(node.values.vec3.z) + ")");
 				break;
 
 			case ShaderAst::ExpressionType::Float4:
-				Append(String::Format("vec4(%F, %F, %F, %F)", node.values.vec4.x, node.values.vec4.y, node.values.vec4.z, node.values.vec4.w));
+				Append("vec4(" + String::Number(node.values.vec4.x) + ", " + String::Number(node.values.vec4.y) + ", " + String::Number(node.values.vec4.z) + ", " + String::Number(node.values.vec4.z) + ")");
 				break;
 
 			default: