diff --git a/architype.js b/architype.js
index 039cf05..43d3c85 100644
--- a/architype.js
+++ b/architype.js
@@ -170,6 +170,10 @@ class Architype {
     this.bucketBySubgraph(graph);
     this.setInitialPositions(graph);
     this.setAffinity(graph);
+
+    while (this.iterate(graph));
+    this.fixOrigin(graph);
+
     return graph;
   }
 
@@ -439,10 +443,6 @@ class Architype {
   }
 
   buildGrid(graph) {
-    while (this.iterate(graph));
-
-    this.fixOrigin(graph);
-
     this.grid_.innerHTML = '';
 
     this.grid_.style.gridTemplateColumns =