diff --git a/build.gradle.kts b/build.gradle.kts
index d01570b..552a981 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("com.android.tools.build:gradle:7.4.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -12,8 +12,8 @@ buildscript {
 }
 
 plugins {
-    id("com.android.application") version "7.3.1" apply false
-    id("com.android.library") version "7.3.1" apply false
+    id("com.android.application") version "7.4.0" apply false
+    id("com.android.library") version "7.4.0" apply false
     id("org.jetbrains.kotlin.android") version "1.7.0" apply false
 }
 
diff --git a/library/src/main/java/com/dzeio/charts/series/BaseSerie.kt b/library/src/main/java/com/dzeio/charts/series/BaseSerie.kt
index a88e3d5..4f28587 100644
--- a/library/src/main/java/com/dzeio/charts/series/BaseSerie.kt
+++ b/library/src/main/java/com/dzeio/charts/series/BaseSerie.kt
@@ -42,8 +42,8 @@ sealed class BaseSerie(
         for (i in 0 until entries.size) {
             val it = entries[i]
             if (it.x in minX..maxX) {
-                if (result.size == 0 && i > 0) {
-                    result.add((entries[i - 1]))
+                if (result.size < 2 && i > 0) {
+                    result.add(entries[i - 1])
                 }
                 lastIndex = i
                 result.add(it)
diff --git a/library/src/main/java/com/dzeio/charts/series/LineSerie.kt b/library/src/main/java/com/dzeio/charts/series/LineSerie.kt
index b5f2d97..5d3c5bb 100644
--- a/library/src/main/java/com/dzeio/charts/series/LineSerie.kt
+++ b/library/src/main/java/com/dzeio/charts/series/LineSerie.kt
@@ -5,6 +5,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.RectF
 import com.dzeio.charts.ChartView
+import kotlin.math.abs
 
 class LineSerie(
     private val view: ChartView
@@ -80,15 +81,91 @@ class LineSerie(
                 paint.color = entry.color!!
             }
 
+            val doDraw = drawableSpace.contains(posX, top) ||
+                (
+                    previousPosX != null &&
+                    previousPosY != null &&
+                    drawableSpace.contains(previousPosX, previousPosY)
+                ) || (
+                    previousPosX != null &&
+                    previousPosY != null &&
+                    posX < drawableSpace.right && (
+                        top <= drawableSpace.top &&
+                        previousPosY >= drawableSpace.bottom ||
+                        top >= drawableSpace.top &&
+                        previousPosY <= drawableSpace.bottom
+                    )
+                )
+
             // draw smol point
-            if (posX < drawableSpace.right) {
+            if (drawableSpace.contains(posX, top)) {
                 canvas.drawCircle(posX, top, paint.strokeWidth, paint)
             }
 
             // draw line
-            if (previousPosX != null && previousPosY != null) {
-                canvas.drawLine(previousPosX, previousPosY, posX, top, paint)
+            if (doDraw && previousPosY != null && previousPosX != null) {
+                var startX = previousPosX
+                var startY = previousPosY
+                var stopX = posX
+                var stopY = top
+                val debugPaint = Paint(linePaint)
+
+                val py = previousPosY
+                val px = previousPosX
+                val dy = abs(py - top)
+                val dx = abs(posX - px)
+
+                if (previousPosX < drawableSpace.left) {
+                    val ratio = dy / dx
+
+                    val dcx = abs(px)
+                    val dcy = dcx * ratio
+
+                    val ny = if (startY > stopY) py - dcy else py + dcy
+                    startY = ny
+                    startX = drawableSpace.left
+                    debugPaint.color = Color.YELLOW
+                } else if (posX > drawableSpace.right) {
+                    val ratio = dy / dx
+
+                    val dcx = posX - drawableSpace.right
+                    val dcy = dcx * ratio
+
+                    val ny = if (py > top) top + dcy else top - dcy
+                    stopY = ny
+                    stopX = drawableSpace.right
+                    debugPaint.color = Color.GRAY
+                }
+
+                if (
+                    startX == previousPosX &&
+                    (previousPosY > drawableSpace.bottom || previousPosY < drawableSpace.top)
+                ) {
+                    val dvb = if (top > py) top else drawableSpace.bottom - top
+
+                    val ratio = dx / dy
 
+                    val dcy = dy - dvb
+                    val dcx = dcy * ratio
+
+                    val nx = px + dcx
+                    startX = nx
+                    startY = if (top > py) drawableSpace.top else drawableSpace.bottom
+                    debugPaint.color = Color.BLUE
+                }
+                if (top > drawableSpace.bottom) {
+                    val ratio = dx / dy
+                    val dcy = drawableSpace.bottom - py
+                    val dcx = dcy * ratio
+                    stopX = px + dcx
+                    stopY = drawableSpace.bottom
+                    if (startX != previousPosX) {
+                        debugPaint.color = Color.GREEN
+                    } else {
+                        debugPaint.color = Color.RED
+                    }
+                }
+                canvas.drawLine(startX, startY, stopX, stopY, if (view.debug) debugPaint else linePaint)
             }
             previousPosX = posX
             previousPosY = top