diff --git a/WickedEngine/brdf.hlsli b/WickedEngine/brdf.hlsli
index b8a4e2bdb..73a06d38d 100644
--- a/WickedEngine/brdf.hlsli
+++ b/WickedEngine/brdf.hlsli
@@ -77,10 +77,9 @@ struct Surface
 		init();
 
 		roughness = material.roughness;
-		float metalness = material.metalness;
-		float reflectance = material.reflectance;
 		f0 = material.specularColor.rgb * material.specularColor.a;
 
+		[branch]
 		if (material.IsUsingSpecularGlossinessWorkflow())
 		{
 			// Specular-glossiness workflow:
@@ -96,10 +95,10 @@ struct Surface
 				occlusion = surfaceMap.r;
 			}
 			roughness *= surfaceMap.g;
-			metalness *= surfaceMap.b;
-			reflectance *= surfaceMap.a;
+			float metalness = material.metalness * surfaceMap.b;
+			float reflectance = material.reflectance * surfaceMap.a;
 			albedo = lerp(lerp(baseColor.rgb, float3(0, 0, 0), reflectance), float3(0, 0, 0), metalness);
-			f0 = lerp(lerp(float3(0, 0, 0), float3(1, 1, 1), reflectance), baseColor.rgb, metalness);
+			f0 *= lerp(lerp(float3(0, 0, 0), float3(1, 1, 1), reflectance), baseColor.rgb, metalness);
 		}
 	}
 
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index 346a86940..171937f12 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates, breaking compatibility changes
 	const int minor = 51;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 24;
+	const int revision = 25;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);