diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index a801a5ec..b7c38f46 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -2714,6 +2714,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Upgraded to Java 8</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Hide the 3rd control point for components that do not need it (Trace, Jumper, Line)</description>
+				</org.diylc.appframework.update.Change>	
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>	
diff --git a/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java b/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java
index 66e4956f..236b2747 100644
--- a/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java
+++ b/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java
@@ -471,7 +471,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
    * @return shape that represents component body. Shape should not be transformed and should be
    *         referenced to (0, 0).
    */
-  protected abstract Shape getBodyShape();
+  protected abstract Shape getBodyShape();   
 
   /**
    * Controls how component shape should be placed relative to start and end point.
@@ -516,7 +516,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 
   @Override
   public int getControlPointCount() {
-    return getPoints().length;
+    return getPoints().length - (getMoveLabel() ? 0 : 1);
   }
 
   @Override