diff --git a/companion/src/firmwares/rawsource.cpp b/companion/src/firmwares/rawsource.cpp
index c784bafb6..4897b8a78 100644
--- a/companion/src/firmwares/rawsource.cpp
+++ b/companion/src/firmwares/rawsource.cpp
@@ -77,7 +77,7 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting
       break;
 
     case SOURCE_TYPE_GVAR: {
-      GVarData gv = model->gvarData[index];
+      GVarData gv = model->gvarData[index - 1];
       result.step = gv.multiplierGet();
       result.decimals = gv.prec;
       result.max = gv.getMaxPrec();
diff --git a/companion/src/print/modelprinter.cpp b/companion/src/print/modelprinter.cpp
index 227d0607b..10a46797c 100644
--- a/companion/src/print/modelprinter.cpp
+++ b/companion/src/print/modelprinter.cpp
@@ -561,7 +561,7 @@ QString ModelPrinter::printLogicalSwitchLine(int idx)
         result += " ~ ";
       else
         result += tr(" missing");
-      result += QString::number(range.step * (ls.val2 /*TODO+ source.getRawOffset(model)*/) + range.offset);
+      result += QString::number((double)(range.step * ls.val2 /*TODO+ source.getRawOffset(model)*/) + range.offset, 'f', range.decimals);
       result += range.unit;
       break;
     }