diff --git a/SDK/src/NDK/Components/CollisionComponent.cpp b/SDK/src/NDK/Components/CollisionComponent.cpp
index 827a698ac..929b087eb 100644
--- a/SDK/src/NDK/Components/CollisionComponent.cpp
+++ b/SDK/src/NDK/Components/CollisionComponent.cpp
@@ -4,6 +4,7 @@
 
 #include <NDK/Components/CollisionComponent.hpp>
 #include <Nazara/Physics/PhysObject.hpp>
+#include <NDK/Algorithm.hpp>
 #include <NDK/World.hpp>
 #include <NDK/Components/PhysicsComponent.hpp>
 #include <NDK/Systems/PhysicsSystem.hpp>
@@ -48,13 +49,13 @@ namespace Ndk
 
 	void CollisionComponent::OnComponentAttached(BaseComponent& component)
 	{
-		if (component.GetIndex() == GetComponentIndex<PhysicsComponent>())
+		if (IsComponent<PhysicsComponent>(component))
 			m_staticBody.reset();
 	}
 
 	void CollisionComponent::OnComponentDetached(BaseComponent& component)
 	{
-		if (component.GetIndex() == GetComponentIndex<PhysicsComponent>())
+		if (IsComponent<PhysicsComponent>(component))
 			InitializeStaticBody();
 	}
 
diff --git a/SDK/src/NDK/Components/PhysicsComponent.cpp b/SDK/src/NDK/Components/PhysicsComponent.cpp
index d900b46d7..6c70dbff7 100644
--- a/SDK/src/NDK/Components/PhysicsComponent.cpp
+++ b/SDK/src/NDK/Components/PhysicsComponent.cpp
@@ -4,6 +4,7 @@
 
 #include <NDK/Components/PhysicsComponent.hpp>
 #include <Nazara/Physics/PhysObject.hpp>
+#include <NDK/Algorithm.hpp>
 #include <NDK/World.hpp>
 #include <NDK/Components/CollisionComponent.hpp>
 #include <NDK/Components/NodeComponent.hpp>
@@ -34,7 +35,7 @@ namespace Ndk
 
 	void PhysicsComponent::OnComponentAttached(BaseComponent& component)
 	{
-		if (component.GetIndex() == GetComponentIndex<CollisionComponent>())
+		if (IsComponent<CollisionComponent>(component))
 		{
 			NazaraAssert(m_object, "Invalid object");
 			m_object->SetGeom(static_cast<CollisionComponent&>(component).GetGeom());
@@ -43,7 +44,7 @@ namespace Ndk
 
 	void PhysicsComponent::OnComponentDetached(BaseComponent& component)
 	{
-		if (component.GetIndex() == GetComponentIndex<CollisionComponent>())
+		if (IsComponent<CollisionComponent>(component))
 		{
 			NazaraAssert(m_object, "Invalid object");
 			m_object->SetGeom(NzNullGeom::New());