diff --git a/geometry2.cpp b/geometry2.cpp
index a12ffb1f..6d8dcc71 100644
--- a/geometry2.cpp
+++ b/geometry2.cpp
@@ -289,6 +289,11 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
           newbase = c;
           }
         }
+      if(newbase) {
+        base = newbase;
+        at = bestV * at;
+        }
+      else at = master_relative(base, true) * at;
       if(tohex && GOLDBERG) {
         while(true) {
           newbase = NULL;
@@ -306,11 +311,6 @@ void virtualRebase(cell*& base, T& at, bool tohex, const U& check) {
           at = bestV * at;
           }
         }
-      if(newbase) {
-        base = newbase;
-        at = bestV * at;
-        }
-      else at = master_relative(base, true) * at;
       break;
       }
     }