diff --git a/kraken/nodes/KRCamera.cpp b/kraken/nodes/KRCamera.cpp
index 8f3729e..58cb63a 100755
--- a/kraken/nodes/KRCamera.cpp
+++ b/kraken/nodes/KRCamera.cpp
@@ -273,26 +273,6 @@ void KRCamera::renderFrame(VkCommandBuffer& commandBuffer, KRSurface& compositeS
 
     GL_POP_GROUP_MARKER;
 
-    // ----------  Start: Vulkan Debug Code ----------
-
-    KRMesh* sphereMesh = getContext().getMeshManager()->getMaxLODModel("__sphere");
-    if (sphereMesh && sphereMesh->isReady()) {
-      PipelineInfo info{};
-      std::string shader_name("vulkan_test");
-      info.shader_name = &shader_name;
-      info.pCamera = this;
-      info.renderPass = compositeSurface.getRenderPass(RenderPassType::RENDER_PASS_FORWARD_OPAQUE);
-      info.rasterMode = RasterMode::kOpaque;
-      info.vertexAttributes = sphereMesh->getVertexAttributes();
-      info.modelFormat = sphereMesh->getModelFormat();
-      KRPipeline* testPipeline = m_pContext->getPipelineManager()->getPipeline(compositeSurface, info);
-      testPipeline->bind(ri, Matrix4());
-      sphereMesh->renderNoMaterials(commandBuffer, info.renderPass, "Vulkan Test", "vulkan_test", 1.0);
-    }
-
-    // ----------  End: Vulkan Debug Code ----------
-
-
     ri.renderPass->end(commandBuffer);
   }
 
diff --git a/kraken/resources/scene/KRScene.cpp b/kraken/resources/scene/KRScene.cpp
index 8c2aaed..a1e0ef5 100755
--- a/kraken/resources/scene/KRScene.cpp
+++ b/kraken/resources/scene/KRScene.cpp
@@ -104,6 +104,26 @@ std::set<KRLight*>& KRScene::getLights()
 void KRScene::render(KRNode::RenderInfo& ri)
 {
 
+  // ----------  Start: Vulkan Debug Code ----------
+  if (ri.renderPass->getType() == RenderPassType::RENDER_PASS_FORWARD_OPAQUE) {
+    KRMesh* sphereMesh = getContext().getMeshManager()->getMaxLODModel("__sphere");
+    if (sphereMesh && sphereMesh->isReady()) {
+      PipelineInfo info{};
+      std::string shader_name("vulkan_test");
+      info.shader_name = &shader_name;
+      info.pCamera = ri.camera;
+      info.renderPass = ri.renderPass;
+      info.rasterMode = RasterMode::kOpaque;
+      info.vertexAttributes = sphereMesh->getVertexAttributes();
+      info.modelFormat = sphereMesh->getModelFormat();
+      KRPipeline* testPipeline = m_pContext->getPipelineManager()->getPipeline(*ri.surface, info);
+      testPipeline->bind(ri, Matrix4());
+      sphereMesh->renderNoMaterials(ri.commandBuffer, info.renderPass, "Vulkan Test", "vulkan_test", 1.0);
+    }
+  }
+
+  // ----------  End: Vulkan Debug Code ----------
+
   if (getFirstLight() == NULL) {
     addDefaultLights();
   }