diff --git a/src/adl/to_psql.clj b/src/adl/to_psql.clj
index 64d6826..16587c2 100644
--- a/src/adl/to_psql.clj
+++ b/src/adl/to_psql.clj
@@ -369,15 +369,17 @@
                   (map
                     (fn [f]
                       (let
-                        [farside (entity-for-property f application)]
+                       [farside (entity-for-property f application)
+                        farname (safe-name farside :sql)
+                        fieldname (safe-name (field-name f) :sql)]
                         (str
-                          (safe-name entity :sql)
-                          "."
-                          (field-name f)
-                          " = "
-                          (safe-name farside :sql)
-                          "."
-                          (safe-name (first (key-names farside)) :sql))))
+                         (safe-name entity :sql)
+                         "."
+                         fieldname
+                         " = "
+                         fieldname
+                         "."
+                         (safe-name (first (key-names farside)) :sql))))
                     entity-properties))))
             ";"
             (emit-permissions-grant view-name :SELECT (find-permissions entity application))))))))