diff --git a/b_asic/signal_flow_graph.py b/b_asic/signal_flow_graph.py
index fb7849134d1a34c60295de7e797c02cd56801404..89a6bfeed62b07a1e3dd2e7a84e47a66d9dbe5b5 100644
--- a/b_asic/signal_flow_graph.py
+++ b/b_asic/signal_flow_graph.py
@@ -549,10 +549,8 @@ class SFG(AbstractOperation):
         type_name : TypeName
             The TypeName of the desired components.
         """
-        reg = f"{type_name}[0-9]+"
-        p = re.compile(reg)
         components = [
-            val for key, val in self._components_by_id.items() if p.match(key)
+            com for com in self._components_dfs_order if com.type_name() == type_name
         ]
         return components