diff --git a/companion/src/eepromimportexport.h b/companion/src/eepromimportexport.h
index 39faaf525..0d7ea49ec 100644
--- a/companion/src/eepromimportexport.h
+++ b/companion/src/eepromimportexport.h
@@ -664,15 +664,19 @@ class ConversionField: public TransformedField {
 
     virtual void afterImport()
     {
+      field = _field;
+
       if (table) {
-        if (table->importValue(_field, field))
+        if (table->importValue(field, field))
           return;
       }
 
-      field -= shift;
+      if (shift) {
+        field -= shift;
+      }
 
       if (importFunc) {
-        field = importFunc(_field);
+        field = importFunc(field);
       }
 
       if (scale) {