diff --git a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java b/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
index 49f486570..be13514f0 100644
--- a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
@@ -150,7 +150,7 @@ public class OperatorSelector extends JDialog {
 	
 	private void selectOperator(){
 		int row = table.getSelectedRow();
-		String str = tableModel.getOperatorAt(row);
+		String str = table.getValueAt(row, 0).toString();
 		parentBuilder.pasteIntoExpression(str);
 		OperatorSelector.this.dispose();
 	}
diff --git a/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java b/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
index 5e0cfe9c1..90130e63d 100644
--- a/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
@@ -141,7 +141,7 @@ public class VariableSelector extends JDialog {
 	
 	private void selectVariable(){
 		int row = table.getSelectedRow();
-		String str = tableModel.getSymbolAt(row);
+		String str = table.getValueAt(row, 1).toString();
 		parentBuilder.pasteIntoExpression(str);
 		VariableSelector.this.dispose();
 	}