diff --git a/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs b/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
index 9fd7dab4..e7f6cfbe 100644
--- a/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
+++ b/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
@@ -341,10 +341,11 @@ List<NavMeshBuildSource> CollectSources()
             }
 
             if (m_IgnoreNavMeshAgent)
-                sources.RemoveAll((x) => (x.component != null && x.component.gameObject.GetComponent<NavMeshAgent>() != null));
+				sources.RemoveAll((x) => x.component != null && x.component is NavMeshAgent);
+
+			if (m_IgnoreNavMeshObstacle)
+				sources.RemoveAll((x) => x.component != null && x.component is NavMeshObstacle);
 
-            if (m_IgnoreNavMeshObstacle)
-                sources.RemoveAll((x) => (x.component != null && x.component.gameObject.GetComponent<NavMeshObstacle>() != null));
 
             AppendModifierVolumes(ref sources);