diff --git a/kadmos/graph/graph_kadmos.py b/kadmos/graph/graph_kadmos.py
index 86ac775ac70458e9b63f1ece6f3057fa52107033..0ec9326ac6766ffd4fd58b3f8b9c63e7af2a9c37 100644
--- a/kadmos/graph/graph_kadmos.py
+++ b/kadmos/graph/graph_kadmos.py
@@ -1259,10 +1259,18 @@ class KadmosGraph(nx.DiGraph, EquationMixin, VistomsMixin):
         for variable in cmdows.findall('parameters/parameter'):
             uid = variable.get('uID').replace("'", '"')
 
-            if variable.findtext('relatedInstanceUID'):
-                related_variable = cmdows.xpath(get_uid_search_xpath(variable.findtext('relatedInstanceUID')))[0]
-            else:
-                related_variable = variable
+            # TODO: Adjust this to improve performance, xpath search takes too long now...
+            # TODO: Handle case of having the relatedInstanceUID missing
+            # if variable.findtext('relatedInstanceUID'):
+            #     print variable
+            #     related_variable_els = cmdows.xpath(get_uid_search_xpath(variable.findtext('relatedInstanceUID')))
+            #     # If loop to catch issue when the related UID does not exist
+            #     if related_variable_els:
+            #         related_variable = related_variable_els[0]
+            #     else:
+            #         related_variable = variable
+            # else:
+            related_variable = variable
 
             self.add_node(uid,
                           category='variable',