diff --git a/core/src/main/java/org/eqasim/core/simulation/analysis/AnalysisOutputListener.java b/core/src/main/java/org/eqasim/core/simulation/analysis/AnalysisOutputListener.java
index de54579c3..cfb50cf0f 100644
--- a/core/src/main/java/org/eqasim/core/simulation/analysis/AnalysisOutputListener.java
+++ b/core/src/main/java/org/eqasim/core/simulation/analysis/AnalysisOutputListener.java
@@ -82,13 +82,14 @@ public void notifyIterationStarts(IterationStartsEvent event) {
 				event.getServices().getEvents().addHandler(tripAnalysisListener);
 				event.getServices().getEvents().addHandler(legAnalysisListener);
 				event.getServices().getEvents().addHandler(ptAnalysisListener);
+				event.getServices().getEvents().addHandler(activityAnalysisListener);
 			}
 		}
 
 		if (travelTimeInterval > 0) {
 			if (event.getIteration() % travelTimeInterval == 0 || event.isLastIteration()) {
 				isTravelTimeActive = true;
-				event.getServices().getEvents().addHandler(activityAnalysisListener);
+				event.getServices().getEvents().addHandler(travelTimeRecorder);
 			}
 		}
 	}