diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 68d045ffafe2359ad0b3b3db8e0894f42b8f091e..ff5c4f080a101d2b6c4824fc743e86b4561b893d 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="3">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
 <AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="1400" zoom="1.0" >
diff --git a/src/main/java/ui/avatarmad/AvatarMADAssumption.java b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
index 6d1dc1d9cc2bedc61b8556ef51eedea447d56364..87312f4a6b776ebf4f9a86df3f0848d07cb6aec4 100644
--- a/src/main/java/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
@@ -319,7 +319,6 @@ public class AvatarMADAssumption extends TGCScalableWithInternalComponent implem
                 return false;
             }
 
-
             int size = graphics.getFontMetrics().stringWidth(s) + iconSize + 5;
             minDesiredWidth = Math.max(size, minWidth);
             if (minDesiredWidth != width) {
@@ -327,15 +326,10 @@ public class AvatarMADAssumption extends TGCScalableWithInternalComponent implem
             }
             setValue(s);
 
-
         }
 
-
         return true;
-
-        // On the name ?
-
-
+        
     }
 
 
diff --git a/src/main/java/ui/ucd/TGConnectingPointUCD.java b/src/main/java/ui/ucd/TGConnectingPointUCD.java
index 02c40f34a45f73961a1f8291171ab48f68d166ec..0c1ee77abeacbff69a72053fb14089b29838d159 100755
--- a/src/main/java/ui/ucd/TGConnectingPointUCD.java
+++ b/src/main/java/ui/ucd/TGConnectingPointUCD.java
@@ -61,7 +61,8 @@ public class TGConnectingPointUCD extends  TGConnectingPointWidthHeight{
     @Override
     public boolean isCompatibleWith(int type) {
         //
-        if ((type == TGComponentManager.CONNECTOR_ACTOR_UCD) ||(type == TGComponentManager.CONNECTOR_INCLUDE_UCD) || (type == TGComponentManager.CONNECTOR_SPECIA_UCD) || (type == TGComponentManager.CONNECTOR_EXTEND_UCD)) {
+        if ((type == TGComponentManager.CONNECTOR_ACTOR_UCD) ||(type == TGComponentManager.CONNECTOR_INCLUDE_UCD) ||
+                (type == TGComponentManager.CONNECTOR_SPECIA_UCD) || (type == TGComponentManager.CONNECTOR_EXTEND_UCD)) {
             //
             return true;
         }
@@ -93,6 +94,13 @@ public class TGConnectingPointUCD extends  TGConnectingPointWidthHeight{
                 return false;
             }
 
+            if ((outPoint.getFather() == getFather()) && (type == TGComponentManager.CONNECTOR_EXTEND_UCD)) {
+                return false;
+            }
+
+            if ((outPoint.getFather() == getFather()) && (type == TGComponentManager.CONNECTOR_SPECIA_UCD)) {
+                return false;
+            }
 
         }