diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index b1a394e31..9e10f7a0a 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -109,6 +109,11 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 			cur.active = _active;
 		}
 	}
+
+	public void copyStages(FlightConfiguration other) {
+		for (StageFlags cur : other.stages.values())
+			stages.put(cur.stageNumber, new StageFlags(cur.stageNumber, cur.active));
+	}
 	
 	/** 
 	 * This method flags a stage inactive.  Other stages are unaffected.
diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
index f9bb927ca..9d562ac3f 100644
--- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
+++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
@@ -408,7 +408,8 @@ public class BasicEventSimulationEngine implements SimulationEngine {
 	
 				// Mark the status as having dropped the booster
 				currentStatus.getConfiguration().clearStage( stageNumber);
-				
+				log.trace("current branch stages: " + currentStatus.getConfiguration().toStageListDetail());
+						  
 				// Prepare the simulation branch
 				SimulationStatus boosterStatus = new SimulationStatus(currentStatus);
 				boosterStatus.setFlightData(new FlightDataBranch(boosterStage.getName(), FlightDataType.TYPE_TIME));
@@ -418,6 +419,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
 				log.info(String.format("==>> @ %g; from Branch: %s ---- Branching: %s ---- \n",
 						currentStatus.getSimulationTime(), 
 						currentStatus.getFlightData().getBranchName(), boosterStatus.getFlightData().getBranchName()));
+				log.trace("new branch stages: " + boosterStatus.getConfiguration().toStageListDetail());
 				
 				break;
 			}
diff --git a/core/src/net/sf/openrocket/simulation/SimulationStatus.java b/core/src/net/sf/openrocket/simulation/SimulationStatus.java
index d8d48691b..9ea75832d 100644
--- a/core/src/net/sf/openrocket/simulation/SimulationStatus.java
+++ b/core/src/net/sf/openrocket/simulation/SimulationStatus.java
@@ -105,8 +105,6 @@ public class SimulationStatus implements Monitorable {
 		double angle = -cond.getTheta() - (Math.PI / 2.0 - this.simulationConditions.getLaunchRodDirection());
 		o = Quaternion.rotation(new Coordinate(0, 0, angle));
 		
-		
-		
 		// Launch rod angle and direction
 		o = o.multiplyLeft(Quaternion.rotation(new Coordinate(0, this.simulationConditions.getLaunchRodAngle(), 0)));
 		o = o.multiplyLeft(Quaternion.rotation(new Coordinate(0, 0, Math.PI / 2.0 - this.simulationConditions.getLaunchRodDirection())));
@@ -182,6 +180,8 @@ public class SimulationStatus implements Monitorable {
 		this.apogeeReached = orig.apogeeReached;
 		this.tumbling = orig.tumbling;
 		
+		this.configuration.copyStages(orig.configuration);
+		
 		this.deployedRecoveryDevices.clear();
 		this.deployedRecoveryDevices.addAll(orig.deployedRecoveryDevices);