diff --git a/eeschema/tools/sch_line_wire_bus_tool.cpp b/eeschema/tools/sch_line_wire_bus_tool.cpp
index d9f8b0e6c4..0bee42b1e7 100644
--- a/eeschema/tools/sch_line_wire_bus_tool.cpp
+++ b/eeschema/tools/sch_line_wire_bus_tool.cpp
@@ -905,7 +905,12 @@ void SCH_LINE_WIRE_BUS_TOOL::finishSegments()
     // Correct and remove segments that need to be merged.
     m_frame->SchematicCleanUp();
 
+    std::vector<SCH_ITEM*> components;
+
     for( SCH_ITEM* item : m_frame->GetScreen()->Items().OfType( SCH_COMPONENT_T ) )
+        components.push_back( item );
+
+    for( SCH_ITEM* item : components )
     {
         std::vector<wxPoint> pts = item->GetConnectionPoints();