diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
index 498e807f..dd4d33fd 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
@@ -122,7 +122,7 @@ namespace SHADE
         std::unique_ptr<char>                          matPropsData;
         Byte                                           matPropsDataSize          = 0;
         Byte                                           singleMatPropAlignedSize  = 0;
-		Byte                                           singleMatPropSize             = 0;
+		Byte                                           singleMatPropSize         = 0;
         bool isCPUBuffersDirty                                                   = true;
         // GPU Buffers                                 
         TripleBuffer                                   drawDataBuffer;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp
index b827652e..6760d937 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHSuperBatch.cpp
@@ -69,9 +69,9 @@ namespace SHADE
 
     batch->Remove(renderable);
 
-    // If batch is empty, remove batch
-    if (batch->IsEmpty())
-      batches.erase(batch);
+    // TODO: If the pipeline is unloaded, we remove the batch
+    /*if (batch->IsEmpty() && !batch->GetPipeline())
+      batches.erase(batch);*/
   }
 
   void SHSuperBatch::Clear() noexcept