diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 0e357a424df0c434b667439d525adab96812775b..17a7e94a489625a06f45e62650f0de37dfac23e2 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -238,10 +238,10 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
 					}
 					intraThreadPipeFactory.create(connection.getSourcePort(), connection.getTargetPort());
 					colors.put(targetStage, i);
+					colorAndConnectStages(i, colors, targetStage);
 				}
 				connected++;
 				// configuration.getConnections().remove(connection); remove connection to increase performance
-				colorAndConnectStages(i, colors, targetStage);
 			}
 		}
 	}