diff --git a/CodeCompletion/FindReferences.cs b/CodeCompletion/FindReferences.cs
index 67b777633..d390a9a75 100644
--- a/CodeCompletion/FindReferences.cs
+++ b/CodeCompletion/FindReferences.cs
@@ -83,6 +83,18 @@ namespace CodeCompletion
             _assign.from.visit(this);
         }
 
+        public override void visit(assign_tuple _assign_tuple)
+        {
+            _assign_tuple.vars.visit(this);
+            _assign_tuple.expr.visit(this);
+        }
+
+        public override void visit(addressed_value_list _addressed_value_list)
+        {
+            foreach (addressed_value av in _addressed_value_list.variables)
+                av.visit(this);
+        }
+
         public override void visit(bin_expr _bin_expr)
         {
             //throw new NotImplementedException();
diff --git a/VisualPlugins/SyntaxTreeVisualisator/Visitors/visualizator.cs b/VisualPlugins/SyntaxTreeVisualisator/Visitors/visualizator.cs
index ad03954d8..3572682f1 100644
--- a/VisualPlugins/SyntaxTreeVisualisator/Visitors/visualizator.cs
+++ b/VisualPlugins/SyntaxTreeVisualisator/Visitors/visualizator.cs
@@ -83,8 +83,13 @@ namespace VisualPascalABCPlugins
 	        prepare_node(_assign.from,"from");
         }
 
+        public override void visit(assign_tuple _assign_tuple)
+        {
+            prepare_node(_assign_tuple.vars, "to");
+            prepare_node(_assign_tuple.expr, "from");
+        }
 
-		public override void visit(bin_expr _bin_expr)
+        public override void visit(bin_expr _bin_expr)
 		{
 			prepare_node(_bin_expr.left,"left");
 			prepare_node(_bin_expr.right,"right");