diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 507b5a00d..a579e3902 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -295,19 +295,14 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 
 		// generate the Instance's Context:
 		for(int currentInstanceNumber=0; currentInstanceNumber < instanceCount; currentInstanceNumber++) {
-			
-			final Coordinate instanceOffset = allOffsets[currentInstanceNumber];
-			final Transformation offsetTransform = Transformation.getTranslationTransform( instanceOffset );
-			
-			final double instanceAngle = allAngles[currentInstanceNumber];
-			final Transformation angleTransform = Transformation.getAxialRotation(instanceAngle);
-			
+			final Transformation offsetTransform = Transformation.getTranslationTransform( allOffsets[currentInstanceNumber] );
+			final Transformation angleTransform = Transformation.getAxialRotation(allAngles[currentInstanceNumber]);
 			final Transformation currentTransform = componentTransform.applyTransformation(offsetTransform)
-																  	  .applyTransformation(angleTransform);
-			
-			// constructs entry in-place 
+																	  .applyTransformation(angleTransform);
+
+			// constructs entry in-place
 			results.emplace(component, active, currentInstanceNumber, currentTransform);
-			
+
 			for(RocketComponent child : component.getChildren()) {
 				getContextListAt(child, results, currentTransform);
 			}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
index cbfa1af85..c63b84066 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
@@ -237,8 +237,10 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
 		double parentRadius=0;
 		
 		for (body = this.getParent(); body != null; body = body.getParent()) {
-			if (body instanceof BodyTube)
+			if (body instanceof BodyTube) {
 				parentRadius = ((BodyTube) body).getOuterRadius();
+				break;
+			}
 		}
 		
 		this.radialDistance_m = parentRadius;