diff --git a/core/src/net/sf/openrocket/motor/MotorConfiguration.java b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
index 17764ebe2..c1d2e4351 100644
--- a/core/src/net/sf/openrocket/motor/MotorConfiguration.java
+++ b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
@@ -14,6 +14,8 @@ import net.sf.openrocket.util.Inertia;
  */
 public class MotorConfiguration implements FlightConfigurableParameter<MotorConfiguration> {
 	
+	public static final String EMPTY_DESCRIPTION = "Empty Configuration";
+	
 	protected MotorMount mount = null;
 	protected Motor motor = null;
 	protected double ejectionDelay = 0.0;
@@ -64,6 +66,14 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 		return motor != null;
 	}
 	
+	public String getDescription(){
+		if( motor == null ){
+			return EMPTY_DESCRIPTION;
+		}else{
+			return this.motor.getDesignation() + " - " + this.getEjectionDelay();
+		}
+	}
+	
 	public MotorInstanceId getID() {
 		return this.id;
 	}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 77808fd70..eabf07ca0 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -312,7 +312,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		for ( RocketComponent comp : getActiveComponents() ){
 			if (( comp instanceof MotorMount )&&( ((MotorMount)comp).isMotorMount())){ 
 				MotorMount mount = (MotorMount)comp;
-				MotorConfiguration inst = mount.getMotorInstance( fcid);
+				MotorConfiguration motorConfig = mount.getMotorInstance( fcid);
 				
 				if( first ){
 					first = false;
@@ -320,8 +320,8 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 					buff.append(";");
 				}
 				
-				if( ! inst.isEmpty()){
-					buff.append( inst.getMotor().getDesignation());
+				if( ! motorConfig.isEmpty()){
+					buff.append( motorConfig.getDescription());
 					++activeMotorCount;
 				}
 			}