diff --git a/gui/builtinGraphs/base.py b/gui/builtinGraphs/base.py
index a944a8a4f..ba3c256dc 100644
--- a/gui/builtinGraphs/base.py
+++ b/gui/builtinGraphs/base.py
@@ -232,11 +232,13 @@ class FitGraph(metaclass=ABCMeta):
 
     def _getPoints(self, mainParam, miscParams, xSpec, ySpec, fit, tgt):
         try:
-            getter = self._getters[(xSpec.handle, ySpec.handle)]
+            fullGetter, singleGetter = self._getters[(xSpec.handle, ySpec.handle)]
         except KeyError:
             return [], []
         else:
-            return getter(self, mainParam, miscParams, fit, tgt)
+            return fullGetter(
+                self, singleGetter=singleGetter, mainParam=mainParam,
+                miscParams=miscParams, fit=fit, tgt=tgt)
 
     _denormalizers = {}
 
diff --git a/gui/builtinGraphs/fitWarpTime.py b/gui/builtinGraphs/fitWarpTime.py
index a305f276c..874bec848 100644
--- a/gui/builtinGraphs/fitWarpTime.py
+++ b/gui/builtinGraphs/fitWarpTime.py
@@ -63,13 +63,11 @@ class FitWarpTimeGraph(FitGraph):
         ('distance', 'AU'): lambda v, fit, tgt: v / AU_METERS,
         ('distance', 'km'): lambda v, fit, tgt: v / 1000}
 
-    def _distance2timeFull(self, mainParam, miscParams, fit, tgt):
+    def _distance2timeFull(self, singleGetter, mainParam, miscParams, fit, tgt):
         xs = []
         ys = []
-        subwarpSpeed = self._subspeedCache.getSubwarpSpeed(fit)
-        warpSpeed = fit.warpSpeed
         for distance in self._iterLinear(mainParam[1]):
-            time = calculate_time_in_warp(max_subwarp_speed=subwarpSpeed, max_warp_speed=warpSpeed, warp_dist=distance)
+            time = singleGetter(self, mainParam=distance, miscParams=miscParams, fit=fit, tgt=tgt)
             xs.append(distance)
             ys.append(time)
         return xs, ys
@@ -81,7 +79,7 @@ class FitWarpTimeGraph(FitGraph):
         return time
 
     _getters = {
-        ('distance', 'time'): _distance2timeFull}
+        ('distance', 'time'): (_distance2timeFull, _distance2timeSingle)}
 
 
 class SubwarpSpeedCache(FitDataCache):