diff --git a/src/main/java/ui/TDiagramMouseManager.java b/src/main/java/ui/TDiagramMouseManager.java
index 48895b01a38191f457baacc394546954010c1256..e21d08b1762ea63875e1eb40061da31c7bc9093f 100755
--- a/src/main/java/ui/TDiagramMouseManager.java
+++ b/src/main/java/ui/TDiagramMouseManager.java
@@ -582,21 +582,17 @@ public class TDiagramMouseManager extends MouseAdapter {//implements MouseListen
             }
         }
         
-        // Issue #69 Always repaint. Needed for displaying the transition element in Avatar state machine diagram
-//
-//        if ((selected == TGComponentManager.CONNECTOR) && (tdp.mode == TDiagramPanel.NORMAL)) { // is connectingPointShow selected
-//            if(tdp.highlightOutAndFreeConnectingPoint(e.getX(), e.getY(), tdp.getMGUI().getIdButtonSelected())) {
-//                tdp.repaint();
-//            }
-//        }
-//
-//        if ((selected == TGComponentManager.CONNECTOR) && (tdp.mode == TDiagramPanel.ADDING_CONNECTOR)) {
-//            tdp.highlightInAndFreeConnectingPoint(e.getX(), e.getY(), tdp.getMGUI().getIdButtonSelected());
-//            tdp.setAddingTGConnector(e.getX(), e.getY());
-//            tdp.repaint();
-//        }
+        if ((selected == TGComponentManager.CONNECTOR) && (tdp.mode == TDiagramPanel.NORMAL)) { // is connectingPointShow selected
+            if(tdp.highlightOutAndFreeConnectingPoint(e.getX(), e.getY(), tdp.getMGUI().getIdButtonSelected())) {
+                tdp.repaint();
+            }
+        }
 
-        tdp.repaint();
+        if ((selected == TGComponentManager.CONNECTOR) && (tdp.mode == TDiagramPanel.ADDING_CONNECTOR)) {
+            tdp.highlightInAndFreeConnectingPoint(e.getX(), e.getY(), tdp.getMGUI().getIdButtonSelected());
+            tdp.setAddingTGConnector(e.getX(), e.getY());
+            tdp.repaint();
+        }
     }
 
     @Override