diff --git a/ExprPrimaryNodes.py b/ExprPrimaryNodes.py
index 2fba479b1f0aaef3a1805c31a922fed38f1903e9..eb236687e54fc074316800ee2976f82d352ace06 100644
--- a/ExprPrimaryNodes.py
+++ b/ExprPrimaryNodes.py
@@ -410,11 +410,13 @@ class FieldAccessNode(ASTNode):
         self.children.append(self.primary)
         self.children.append(self.ID)
 
-    def disambigName(self):
+    def disambigName(self):    
         if not self.primary: # this implies that the ID has nothing that comes before it
             # helperDisambigName(self.ID)
             self.ID.disambigName()
             # self.right.disambigName()
+        else:
+            self.primary.disambigName()
 
     def checkType(self):
         self.primary.checkType()
diff --git a/LineNodes.py b/LineNodes.py
index 52f1a024fec1f19358a2107d00b7771d5f027670..8b439709165c3f8bdb9bd564bdd3cd381f5c6461 100644
--- a/LineNodes.py
+++ b/LineNodes.py
@@ -204,6 +204,10 @@ class ReturnNode(ASTNode):
 
         self.children.append(self.expr)
 
+    def disambigName(self):
+        if self.expr:
+            self.expr.disambigName()
+
     def checkType(self):
         if self.expr:
             self.expr.checkType()