diff --git a/racing.cpp b/racing.cpp
index b1627a72..00a9ec96 100644
--- a/racing.cpp
+++ b/racing.cpp
@@ -267,6 +267,10 @@ void generate_track() {
 
   setdist(s, 6, NULL);
   makeEmpty(s);
+  cview(); // needed for some virtualRebases
+  
+  if(euclid && (penrose || archimedean)) permanent_long_distances(s);
+    compute_saved_distances(s, 300, 1000000);
   
   map<cell*, cell*> parent;
   map<int, vector<cell*> > cellbydist;
@@ -303,6 +307,8 @@ void generate_track() {
       }
     }
 
+  if(euclid && (penrose || archimedean)) permanent_long_distances(goal);
+
   try {
     track = build_shortest_path(s, goal);
     }