diff --git a/src/Camera.cpp b/src/Camera.cpp
index 2db69de..1256e64 100755
--- a/src/Camera.cpp
+++ b/src/Camera.cpp
@@ -77,7 +77,7 @@ void Camera::UpdateProjectionMatrix()
 
 void Camera::UpdateViewMatrix()
 {
-	m_ViewMatrix = glm::translate(glm::toMat4(m_Orientation), -m_Position);
+	m_ViewMatrix = glm::toMat4(glm::inverse(m_Orientation)) * glm::translate(-m_Position);
 }
 
 void Camera::FOV(float val)
diff --git a/src/Systems/RenderSystem.cpp b/src/Systems/RenderSystem.cpp
index e296023..2748eda 100755
--- a/src/Systems/RenderSystem.cpp
+++ b/src/Systems/RenderSystem.cpp
@@ -49,8 +49,8 @@ void Systems::RenderSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 	auto cameraComponent = m_World->GetComponent<Components::Camera>(entity, "Camera");
 	if (cameraComponent != nullptr)
 	{
-		m_Renderer->GetCamera()->Position(transformComponent->Position);
-		m_Renderer->GetCamera()->Orientation(transformComponent->Orientation);
+		m_Renderer->GetCamera()->Position(m_TransformSystem->AbsolutePosition(entity));
+		m_Renderer->GetCamera()->Orientation(m_TransformSystem->AbsoluteOrientation(entity));
 
 		m_Renderer->GetCamera()->FOV(cameraComponent->FOV);
 		m_Renderer->GetCamera()->NearClip(cameraComponent->NearClip);