diff --git a/ExprPrimaryNodes.py b/ExprPrimaryNodes.py
index d853c7d273601ff3642c5c7ef304f789c3bd228e..ea0c0f96986c638e4a3b92a625da907295f14ad8 100644
--- a/ExprPrimaryNodes.py
+++ b/ExprPrimaryNodes.py
@@ -421,7 +421,10 @@ class FieldAccessNode(ASTNode):
 
     def checkType(self):
         self.primary.checkType()
-        self.ID.prefixLink = self.primary.myType.typePointer
+        if self.primary.myType.isArray or self.primary.myType.isPrimitive:
+            self.ID.prefixLink = self.primary
+        else:
+            self.ID.prefixLink = self.primary.myType.typePointer
         self.ID.checkType()
         self.myType = self.ID.myType
 
diff --git a/NameNode.py b/NameNode.py
index 66c5125229799e6508d6036d7b0737fd16261a91..74dee52affac06112b49cf865d245470603733e0 100644
--- a/NameNode.py
+++ b/NameNode.py
@@ -65,6 +65,13 @@ class NameNode(ASTNode):
             self.addToPrefix(typeNode)
             return True
         return False
+    
+    def checkLength(self):
+        if not self.IDs:
+            return True
+        if self.IDs[0] == "length":
+            return True
+        return False
 
     # Checks and updates prefix if the next ID in self.IDs is a local variable or a parameter
     def checkLocalVar(self):
@@ -164,6 +171,10 @@ class NameNode(ASTNode):
         # Checking if a1 is "this"
         if self.checkThis():
             return
+        
+        # Checking if a1 is length
+        if self.checkLength():
+            return
 
         # Checking if a1 is a local variable
         if self.checkLocalVar():