diff --git a/res/shaders/BasePass.slang b/res/shaders/BasePass.slang
index 219ab0c..3bb6f3e 100644
--- a/res/shaders/BasePass.slang
+++ b/res/shaders/BasePass.slang
@@ -25,10 +25,10 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
     {
         result += pLightEnv.directionalLights[i].illuminate(lightingParams, brdf);
     }
-    for(uint i = 0; i < pLightEnv.numPointLights; ++i)
+    for(uint i = 0; i < lightCount; ++i)
     {
-        //uint lightIndex = pLightCullingData.lightIndexList[startOffset + i];
-        result += pLightEnv.pointLights[i].illuminate(lightingParams, brdf);
+        uint lightIndex = pLightCullingData.lightIndexList[startOffset + i];
+        result += pLightEnv.pointLights[lightIndex].illuminate(lightingParams, brdf);
     }
     result += brdf.evaluateAmbient();
     // gamma correction
diff --git a/src/Engine/Graphics/VertexData.cpp b/src/Engine/Graphics/VertexData.cpp
index 53d13bc..bca4524 100644
--- a/src/Engine/Graphics/VertexData.cpp
+++ b/src/Engine/Graphics/VertexData.cpp
@@ -11,7 +11,7 @@
 
 using namespace Seele;
 
-constexpr static uint64 NUM_DEFAULT_ELEMENTS = 1024 * 1024;// 17962284
+constexpr static uint64 NUM_DEFAULT_ELEMENTS = 17962284;
 Map<VertexData::MeshMapping, VertexData::CullingMapping> VertexData::instanceIdMap;
 uint64 VertexData::instanceCount = 0;
 uint64 VertexData::meshletCount = 0;