diff --git a/Pilz.UI/PaintingControl/DefaultDrawMethodes.vb b/Pilz.UI/PaintingControl/DefaultDrawMethodes.vb
index 3f54473..f115a31 100644
--- a/Pilz.UI/PaintingControl/DefaultDrawMethodes.vb
+++ b/Pilz.UI/PaintingControl/DefaultDrawMethodes.vb
@@ -116,14 +116,14 @@ Public Class DefaultDrawMethodes
             .DashStyle = obj.OutlineDashStyle
         }
 
-        If obj.LineStartCap IsNot Nothing Then
-            Dim args As LineCapConfigurationArgs = obj.LineStartCap.Configure
+        If obj.LineEndCap IsNot Nothing Then
+            Dim args As LineCapConfigurationArgs = obj.LineEndCap.Configure
             p2.StartCap = args.LineCap
             p2.CustomStartCap = args.CustomLineCap
         End If
 
-        If obj.LineEndCap IsNot Nothing Then
-            Dim args As LineCapConfigurationArgs = obj.LineEndCap.Configure
+        If obj.LineStartCap IsNot Nothing Then
+            Dim args As LineCapConfigurationArgs = obj.LineStartCap.Configure
             p2.EndCap = args.LineCap
             p2.CustomEndCap = args.CustomLineCap
         End If
diff --git a/Pilz.UI/PaintingControl/PaintingObject.vb b/Pilz.UI/PaintingControl/PaintingObject.vb
index 8e430ee..fa7b219 100644
--- a/Pilz.UI/PaintingControl/PaintingObject.vb
+++ b/Pilz.UI/PaintingControl/PaintingObject.vb
@@ -456,7 +456,7 @@ Imports Newtonsoft.Json
     End Sub
 
     Public Sub Draw(e As PaintEventArgs)
-        Draw(e, PointF.Empty)
+        Draw(e, e.ClipRectangle.Location)
     End Sub
 
     Public Sub Draw(e As PaintEventArgs, offset As PointF)