diff --git a/SDK/src/NDK/Components/GraphicsComponent.cpp b/SDK/src/NDK/Components/GraphicsComponent.cpp
index ee5658e18..606a93d21 100644
--- a/SDK/src/NDK/Components/GraphicsComponent.cpp
+++ b/SDK/src/NDK/Components/GraphicsComponent.cpp
@@ -69,7 +69,7 @@ namespace Ndk
 
 		Ndk::RenderSystem& renderSystem = m_entity->GetWorld()->GetSystem<Ndk::RenderSystem>();
 
-		m_transformMatrix = renderSystem.GetCoordinateSystemMatrix() * m_entity->GetComponent<NodeComponent>().GetTransformMatrix();
+		m_transformMatrix = NzMatrix4f::ConcatenateAffine(renderSystem.GetCoordinateSystemMatrix(), m_entity->GetComponent<NodeComponent>().GetTransformMatrix());
 		m_transformMatrixUpdated = true;
 	}
 
diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp
index 3daa9cf5a..7face4a5a 100644
--- a/SDK/src/NDK/Systems/RenderSystem.cpp
+++ b/SDK/src/NDK/Systems/RenderSystem.cpp
@@ -113,7 +113,7 @@ namespace Ndk
 				NodeComponent& lightNode = light->GetComponent<NodeComponent>();
 
 				///TODO: Cache somehow?
-				lightComponent.AddToRenderQueue(renderQueue, m_coordinateSystemMatrix * drawableNode.GetTransformMatrix());
+				lightComponent.AddToRenderQueue(renderQueue, NzMatrix4f::ConcatenateAffine(m_coordinateSystemMatrix, drawableNode.GetTransformMatrix()));
 			}
 
 			camComponent.ApplyView();