diff --git a/source/Core/BSP/Magic/ThermoModel.cpp b/source/Core/BSP/Magic/ThermoModel.cpp
index 1f4da291..4515c42f 100644
--- a/source/Core/BSP/Magic/ThermoModel.cpp
+++ b/source/Core/BSP/Magic/ThermoModel.cpp
@@ -9,7 +9,7 @@
 #include "configuration.h"
 
 #ifdef TEMP_uV_LOOKUP_HAKKO
-const uint16_t uVtoDegC[] = {
+const int32_t uVtoDegC[] = {
     //
     // uv -> temp in C
     0,     0,   //
@@ -67,6 +67,6 @@ const uint16_t uVtoDegC[] = {
 };
 #endif
 
-const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(uint16_t));
+const int uVtoDegCItems = sizeof(uVtoDegC) / (2 * sizeof(int32_t));
 
 uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return Utils::InterpolateLookupTable(uVtoDegC, uVtoDegCItems, tipuVDelta); }
diff --git a/source/Core/Drivers/Utils.cpp b/source/Core/Drivers/Utils.cpp
index 9d85ef38..2f0587b5 100644
--- a/source/Core/Drivers/Utils.cpp
+++ b/source/Core/Drivers/Utils.cpp
@@ -7,7 +7,7 @@
 
 #include <Utils.h>
 
-int32_t Utils::InterpolateLookupTable(const uint16_t *lookupTable, const int noItems, const uint16_t value) {
+int32_t Utils::InterpolateLookupTable(const int32_t *lookupTable, const int noItems, const int32_t value) {
   if (value) {
     for (int i = 1; i < (noItems - 1); i++) {
       // If current tip temp is less than current lookup, then this current lookup is the higher point to interpolate
diff --git a/source/Core/Drivers/Utils.h b/source/Core/Drivers/Utils.h
index a4e2b07c..040de2c6 100644
--- a/source/Core/Drivers/Utils.h
+++ b/source/Core/Drivers/Utils.h
@@ -10,7 +10,7 @@
 #include <stdint.h>
 class Utils {
 public:
-  static int32_t InterpolateLookupTable(const uint16_t *lookupTable, const int noItems, const uint16_t value);
+  static int32_t InterpolateLookupTable(const int32_t *lookupTable, const int noItems, const int32_t value);
   static int32_t LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x);
 };