diff --git a/Editor/LightWindow.cpp b/Editor/LightWindow.cpp
index ae4ffe1ee..0a2fc9233 100644
--- a/Editor/LightWindow.cpp
+++ b/Editor/LightWindow.cpp
@@ -260,6 +260,8 @@ void LightWindow::SetEntity(Entity entity)
 		haloCheckBox->SetCheck(light->IsVisualizerEnabled());
 		volumetricsCheckBox->SetEnabled(true);
 		volumetricsCheckBox->SetCheck(light->IsVolumetricsEnabled());
+		staticCheckBox->SetEnabled(true);
+		staticCheckBox->SetCheck(light->IsStatic());
 		colorPicker->SetEnabled(true);
 		typeSelectorComboBox->SetEnabled(true);
 		typeSelectorComboBox->SetSelected((int)light->GetType());
@@ -277,6 +279,7 @@ void LightWindow::SetEntity(Entity entity)
 		shadowCheckBox->SetEnabled(false);
 		haloCheckBox->SetEnabled(false);
 		volumetricsCheckBox->SetEnabled(false);
+		staticCheckBox->SetEnabled(false);
 		energySlider->SetEnabled(false);
 		colorPicker->SetEnabled(false);
 		typeSelectorComboBox->SetEnabled(false);
diff --git a/WickedEngine/renderlightmapPS_direct.hlsl b/WickedEngine/renderlightmapPS_direct.hlsl
index b932cebfd..49c9fe177 100644
--- a/WickedEngine/renderlightmapPS_direct.hlsl
+++ b/WickedEngine/renderlightmapPS_direct.hlsl
@@ -134,7 +134,7 @@ float4 main(Input input) : SV_TARGET
 			newRay.direction_inverse = rcp(newRay.direction);
 			newRay.energy = 0;
 			bool hit = TraceSceneANY(newRay, dist);
-			finalResult = (hit ? 0 : NdotL) * (result.diffuse);
+			finalResult += (hit ? 0 : NdotL) * (result.diffuse);
 		}
 	}
 
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index f923c4475..ea766515c 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 24;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 16;
+	const int revision = 17;
 
 
 	long GetVersion()