diff --git a/configtool/page.py b/configtool/page.py
index 3f04f31..c5dd242 100644
--- a/configtool/page.py
+++ b/configtool/page.py
@@ -316,7 +316,14 @@ class Page:
 
     for k in self.choices.keys():
       v = self.choices[k].GetSelection()
-      result[k] = self.choices[k].GetString(v), True
+      s = self.choices[k].GetString(v)
+      if s == "-":
+        if k in self.choicesOriginal.keys():
+          result[k] = self.choicesOriginal[k][0], False
+        else:
+          result[k] = "", False
+      else:
+        result[k] = s, True
 
     for k in self.boolChoices.keys():
       choice = self.boolChoices[k]
diff --git a/configtool/pinoutspage.py b/configtool/pinoutspage.py
index 7282969..866df57 100644
--- a/configtool/pinoutspage.py
+++ b/configtool/pinoutspage.py
@@ -177,15 +177,3 @@ class PinoutsPage(wx.Panel, Page):
   def onChoice(self, evt):
     self.assertModified(True)
     evt.Skip()
-
-  def getValues(self):
-    result = Page.getValues(self)
-
-    for k in self.choices.keys():
-      if result[k][0] == "-":
-        if k in self.choicesOriginal.keys():
-          result[k] = self.choicesOriginal[k][0], False
-        else:
-          result[k] = "", False
-
-    return result
diff --git a/configtool/sensorpage.py b/configtool/sensorpage.py
index 25757b3..1598bdc 100644
--- a/configtool/sensorpage.py
+++ b/configtool/sensorpage.py
@@ -194,11 +194,4 @@ class SensorsPage(wx.Panel, Page):
     for v in values.keys():
       result[v] = values[v]
 
-    for k in self.choices.keys():
-      if result[k][0] == "-":
-        if k in self.choicesOriginal.keys():
-          result[k] = self.choicesOriginal[k][0], False
-        else:
-          result[k] = "", False
-
     return result