diff --git a/app/node/time/timeremap/timeremap.cpp b/app/node/time/timeremap/timeremap.cpp
index 945ac1939..8967faad9 100644
--- a/app/node/time/timeremap/timeremap.cpp
+++ b/app/node/time/timeremap/timeremap.cpp
@@ -67,9 +67,7 @@ QString TimeRemapNode::Description() const
 TimeRange TimeRemapNode::InputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
 {
   if (input == kInputInput) {
-    rational target_time = GetRemappedTime(input_time.in());
-
-    return TimeRange(target_time, target_time + input_time.length());
+    return TimeRange(GetRemappedTime(input_time.in()), GetRemappedTime(input_time.out()));
   } else {
     return super::InputTimeAdjustment(input, element, input_time);
   }
@@ -93,6 +91,11 @@ void TimeRemapNode::Retranslate()
   SetInputName(kInputInput, QStringLiteral("Input"));
 }
 
+void TimeRemapNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
+{
+  table->Push(value[kInputInput]);
+}
+
 void TimeRemapNode::Hash(QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
 {
   // Don't hash anything of our own, just pass-through to the connected node at the remapped tmie
diff --git a/app/node/time/timeremap/timeremap.h b/app/node/time/timeremap/timeremap.h
index 0a2400458..6cdaf618a 100644
--- a/app/node/time/timeremap/timeremap.h
+++ b/app/node/time/timeremap/timeremap.h
@@ -45,6 +45,8 @@ public:
 
   virtual void Retranslate() override;
 
+  virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
+
   static const QString kTimeInput;
   static const QString kInputInput;