diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 2cd14e701..9fbde793f 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -204,7 +204,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	 */
 	public boolean isStageActive(int stageNumber) {
 		if( -1 == stageNumber ) {
-			return false;
+			return true;
 		}
 		
 		return stages.get(stageNumber).active;
@@ -294,10 +294,12 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	}
 
 	private InstanceMap getContextListAt(final RocketComponent component, final InstanceMap results, final Transformation parentTransform ){
+		final boolean active = this.isComponentActive(component);
+		if (!active)
+			return results;
 		final int instanceCount = component.getInstanceCount();
 		final Coordinate[] allOffsets = component.getInstanceOffsets();
 		final double[] allAngles = component.getInstanceAngles();
-		final boolean active = this.isComponentActive(component);
 		
 		final Transformation compLocTransform = Transformation.getTranslationTransform( component.getPosition() );
 		final Transformation componentTransform = parentTransform.applyTransformation(compLocTransform);
@@ -307,8 +309,8 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 			final Transformation offsetTransform = Transformation.getTranslationTransform( allOffsets[currentInstanceNumber] );
 			final Transformation angleTransform = Transformation.getAxialRotation(allAngles[currentInstanceNumber]);
 			final Transformation currentTransform = componentTransform.applyTransformation(offsetTransform)
-																	  .applyTransformation(angleTransform);
-
+				.applyTransformation(angleTransform);
+			
 			// constructs entry in-place
 			results.emplace(component, active, currentInstanceNumber, currentTransform);