diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
index 19e76c98b..976853ff0 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -514,7 +514,8 @@ public class Rocket extends ComponentAssembly {
 			// Notify all components first
 			Iterator<RocketComponent> iterator = this.iterator(true);
 			while (iterator.hasNext()) {
-				iterator.next().componentChanged(cce);
+				RocketComponent next = iterator.next();
+				next.componentChanged(cce);
 			}
 
 			notifyAllListeners(cce);
@@ -554,7 +555,6 @@ public class Rocket extends ComponentAssembly {
 	}
 	
 	private void updateConfigurations(){
-		this.selectedConfiguration.update();
 		for( FlightConfiguration config : configSet ){
 			config.update();
 		}