diff --git a/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java b/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java
index 83afcb397..c896b06fa 100644
--- a/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java
+++ b/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java
@@ -145,6 +145,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
 			log.info("Warnings at the end of simulation:  " + flightData.getWarningSet());
 		}
 
+		flightData.calculateInterestingValues();
 		return flightData;
 	}
 	
diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightData.java b/core/src/main/java/info/openrocket/core/simulation/FlightData.java
index ea6230184..0c28e8f34 100644
--- a/core/src/main/java/info/openrocket/core/simulation/FlightData.java
+++ b/core/src/main/java/info/openrocket/core/simulation/FlightData.java
@@ -129,9 +129,6 @@ public class FlightData {
 		branch.immute();
 		branches.add(branch);
 		
-		if (branches.size() == 1) {
-			calculateInterestingValues();
-		}
 	}
 	
 	public int getBranchCount() {
@@ -201,7 +198,7 @@ public class FlightData {
 	 * Calculate the max. altitude/velocity/acceleration, time to apogee, flight time
 	 * and ground hit velocity.
 	 */
-	private void calculateInterestingValues() {
+	public void calculateInterestingValues() {
 		if (branches.isEmpty())
 			return;