diff --git a/Source/Engine/Visject/ShaderGraph.cpp b/Source/Engine/Visject/ShaderGraph.cpp
index 7545e7c96..5e133eb8c 100644
--- a/Source/Engine/Visject/ShaderGraph.cpp
+++ b/Source/Engine/Visject/ShaderGraph.cpp
@@ -405,9 +405,9 @@ void ShaderGenerator::ProcessGroupMath(Box* box, Node* node, Value& value)
         // Remap
     case 48:
     {
-        auto inVal  = tryGetValue(node->GetBox(0), node->Values[0]);
-        auto rangeA = tryGetValue(node->GetBox(1), node->Values[1]);
-        auto rangeB = tryGetValue(node->GetBox(2), node->Values[2]);
+        auto inVal  = tryGetValue(node->GetBox(0), node->Values[0].AsFloat);
+        auto rangeA = tryGetValue(node->GetBox(1), node->Values[1].AsVector2());
+        auto rangeB = tryGetValue(node->GetBox(2), node->Values[2].AsVector2());
 
         // Clamp value?
         if (node->Values[3].AsBool)
diff --git a/Source/Engine/Visject/VisjectGraph.cpp b/Source/Engine/Visject/VisjectGraph.cpp
index dfd5c9fdf..e4e8f69cf 100644
--- a/Source/Engine/Visject/VisjectGraph.cpp
+++ b/Source/Engine/Visject/VisjectGraph.cpp
@@ -378,7 +378,7 @@ void VisjectExecutor::ProcessGroupMath(Box* box, Node* node, Value& value)
         const Vector2 rangeA = tryGetValue(node->GetBox(1), node->Values[1]).AsVector2();
         const Vector2 rangeB = tryGetValue(node->GetBox(2), node->Values[2]).AsVector2();
 
-        // Use clamp?
+        // Clamp value?
         if (node->Values[3].AsBool) 
         {
             value = Math::Clamp(rangeB.X + (inVal - rangeA.X) * (rangeB.Y - rangeB.X) / (rangeA.Y - rangeA.X), rangeB.X, rangeB.Y);