diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
index b022c8e24..4a8297a98 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt
@@ -335,10 +335,13 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
 					v.segment.transferredLastTick = transferredLastTick
 					v.segment.lastPoweredStatus = lastPoweredStatus
 					v.segment.paths = paths.clone()
+
 					paths.forEach { it.segments.add(v.segment) }
+
 					result.add(v.segment)
 				}
 
+				paths.forEach { it.nodes.addAll(nodes) }
 				return result
 			}
 		}
@@ -493,7 +496,7 @@ class EnergyCableGraph : GraphNodeList<EnergyCableBlockEntity.Node, EnergyCableG
 			var maxThroughput = list.paths.maxOfOrNull { it.availableThroughput } ?: Decimal.ZERO
 			var combinedThroughput = list.paths.iterator().map { it.availableThroughput }.reduce(Decimal.ZERO, Decimal::plus)
 
-			while (combinedThroughput < energyToTransfer && !list.saturated && ++lastTickSearches <= maxSearches) {
+			while (maxThroughput < energyToTransfer && !list.saturated && ++lastTickSearches <= maxSearches) {
 				val find = findPath(a, b, list.paths, maxThroughput)
 
 				if (find == null || find in list.paths) {