diff --git a/core/src/net/sf/openrocket/masscalc/MassCalculation.java b/core/src/net/sf/openrocket/masscalc/MassCalculation.java
index fed4848d8..048ac3cab 100644
--- a/core/src/net/sf/openrocket/masscalc/MassCalculation.java
+++ b/core/src/net/sf/openrocket/masscalc/MassCalculation.java
@@ -239,7 +239,7 @@ public class MassCalculation {
 		addMass( clusterCM );
 
 		if(null != this.analysisMap) {
-			CMAnalysisEntry entry = analysisMap.get(motor.getDesignation());
+			CMAnalysisEntry entry = analysisMap.get(motor.getDesignation().hashCode());
 			if (null == entry){
 				entry = new CMAnalysisEntry(motor);
 				analysisMap.put(motor.getDesignation().hashCode(), entry);
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index 26e4cd1c3..700546742 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -579,7 +579,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 		}
 
 		for(final MotorConfiguration config: configuration.getActiveMotors()) {
-			CMAnalysisEntry cmEntry = cmMap.get(config.getMotor().getDesignation());
+			CMAnalysisEntry cmEntry = cmMap.get(config.getMotor().getDesignation().hashCode());
 			if (null == cmEntry) {
 				continue;
 			}