diff --git a/modules/core/validator.js b/modules/core/validator.js
index 1a60e908b..e01a207a5 100644
--- a/modules/core/validator.js
+++ b/modules/core/validator.js
@@ -94,7 +94,7 @@ export function coreValidator(context) {
 
         // rerun for all buildings
         buildings.forEach(function(entity) {
-            var detected = checkUnsquareWay(entity, context);
+            var detected = checkUnsquareWay(entity, context.graph());
             if (detected.length !== 1) return;
 
             var issue = detected[0];