diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs
index f94698d62e67269c4e6fc6797beb19a49ad6da6a..2253af9e4cfe34312959aabea07641180f7bd053 100755
--- a/Source/Core/GZBuilder/GZGeneral.cs
+++ b/Source/Core/GZBuilder/GZGeneral.cs
@@ -347,7 +347,7 @@ namespace CodeImp.DoomBuilder.GZBuilder
                 // +MISSILEMORE makes it additive.
                 // +MISSILEEVENMORE makes it subtractive.
                 // +INCOMBAT makes it attenuated.
-                LightData ld = GetLightDataByClass(actor.ClassName);
+                LightData ld = GetLightDataByClass(p.ClassName);
                 if (ld != null)
                 {
                     if (ld.LightDef != LightDef.VAVOOM_GENERIC && ld.LightDef != LightDef.VAVOOM_COLORED) // not vavoom
@@ -360,11 +360,13 @@ namespace CodeImp.DoomBuilder.GZBuilder
                             dispType = 9820;
                         else if (actor.GetFlagValue("INCOMBAT", false) || actor.GetFlagValue("DYNAMICLIGHT.ATTENUATE", false))
                             dispType = 9830;
-                        if (actor.GetFlagValue("DYNAMICLIGHT.SPOT", false))
+                        if (!actor.GetFlagValue("DYNAMICLIGHT.SPOT", false) && dispType >= 9840)
+                            dispType -= 40;
+                        if (actor.GetFlagValue("DYNAMICLIGHT.SPOT", false) && dispType < 9840)
                             dispType += 40;
                         return GetLightDataByNum(dispType + baseType);
                     }
-                    else return ld;
+                    else return null;
                 }
 
                 p = p.BaseClass;
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
index 892bc1fc9722f61d58e163eed749de5add65eda2..01f3e120118aa195369868e9a61ecae8e2de17ff 100755
--- a/Source/Core/Properties/AssemblyInfo.cs
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.2995")]
+[assembly: AssemblyVersion("2.3.0.3000")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("d8bee55")]
+[assembly: AssemblyHash("5791171")]
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index 70c74effea4d702a73ce12cbd21e12fa642e4089..30a75e880cc60f86e91e388ef62244c0c36eb98f 100755
--- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
+++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Resources;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.2995")]
+[assembly: AssemblyVersion("2.3.0.3000")]
 [assembly: NeutralResourcesLanguageAttribute("en")]