diff --git a/src/OMSimulatorLib/DirectedGraph.cpp b/src/OMSimulatorLib/DirectedGraph.cpp
index aa8e38914..225647473 100644
--- a/src/OMSimulatorLib/DirectedGraph.cpp
+++ b/src/OMSimulatorLib/DirectedGraph.cpp
@@ -275,10 +275,11 @@ void oms::DirectedGraph::calculateSortedConnections()
       }
     }
 
-    this->component_names.push_back(component_names_local);
-
     if (SCC.size() > 0)
+    {
       sortedConnections.push_back(SCC);
+      this->component_names.push_back(component_names_local);
+    }
 
     if (SCC.size() > 1)
     {