diff --git a/Measure.go b/Measure.go
index ce4820c..16db8d2 100644
--- a/Measure.go
+++ b/Measure.go
@@ -13,6 +13,7 @@ import (
 	"math"
 
 	"github.com/go-gl/mathgl/mgl64"
+	"github.com/xieyuschen/deepcopy"
 
 	"log"
 	"sort"
@@ -82,30 +83,58 @@ func (measure *Measure) MeasureNonnegativeDistance() {
 
 func (measure *Measure) gjk() {
 	measure.simplex = measure.simplex[:0]
-	measure.Distance = math.Inf(1)
 
+	maxes := [2]mgl64.Vec3{}
+	for i := 0; i < len(measure.ConvexHulls); i += 1 {
+		for _, vertex := range measure.ConvexHulls[i] {
+			for j := 0; j < 3; j += 1 {
+				target := 2.0 * math.Abs(vertex[j])
+
+				if target > maxes[i][j] {
+					maxes[i][j] = target
+				}
+			}
+		}
+	}
+
+	var lastSymplex interface{}
+	var lastDirection mgl64.Vec3
+	var lastPoints [2]mgl64.Vec3
+
+loop:
 	for len(measure.simplex) < 4 {
+		lastSymplex, _ = deepcopy.Copy(measure.simplex)
+		lastDirection = measure.Direction
+		lastPoints = measure.Points
+
 		measure.simplex = append(measure.simplex, newVertex(measure.ConvexHulls, measure.Direction))
 
 		if measure.simplexHasCyclic(len(measure.simplex)-1, 0) {
-			measure.simplex = measure.simplex[:len(measure.simplex)-1]
-			break
+			measure.simplex = lastSymplex.([]*vertex)
+			break loop
 		}
 
 		if measure.updateSimplex() {
-			measure.updateDirection()
-			break
+			measure.simplex = lastSymplex.([]*vertex)
+			break loop
 		}
 
 		measure.updateDirection()
-		lastDistance := measure.Distance
-		measure.updateDistance()
-		if measure.Distance >= lastDistance {
-			break
+		measure.updatePoints()
+		for i := 0; i < len(measure.Points); i += 1 {
+			for j := 0; j < 3; j += 1 {
+				if !(math.Abs(measure.Points[i][j]) < maxes[i][j]) { // For the case where points[i][j] == NaN
+					measure.simplex = lastSymplex.([]*vertex)
+					measure.Direction = lastDirection
+					measure.Points = lastPoints
+					break loop
+				}
+			}
 		}
 	}
 
-	measure.updateTheOthers()
+	measure.updateOns()
+	measure.updateDistance()
 }
 
 func (measure *Measure) epa() {
@@ -165,8 +194,9 @@ findOuterMinDistanceFace:
 	measure.simplex = newSimplex
 	measure.updateSimplex()
 	measure.updateDirection()
+	measure.updatePoints()
+	measure.updateOns()
 	measure.updateDistance()
-	measure.updateTheOthers()
 
 	measure.Distance *= -1.0
 }
@@ -322,6 +352,10 @@ func (measure *Measure) updateSimplex() (isDegenerated bool) {
 		vAD := -a.Dot(ad)
 
 		n := ad.Cross(ab)
+		if n[0] == 0.0 && n[1] == 0.0 && n[2] == 0.0 {
+			isDegenerated = true
+			return
+		}
 		n1 := d.Cross(b)
 		n2 := b.Cross(a)
 		n3 := a.Cross(d)
@@ -331,6 +365,10 @@ func (measure *Measure) updateSimplex() (isDegenerated bool) {
 		wADB := n3.Dot(n)
 
 		n = ac.Cross(ad)
+		if n[0] == 0.0 && n[1] == 0.0 && n[2] == 0.0 {
+			isDegenerated = true
+			return
+		}
 		n1 = c.Cross(d)
 		n2 = d.Cross(a)
 		n3 = a.Cross(c)
@@ -340,6 +378,10 @@ func (measure *Measure) updateSimplex() (isDegenerated bool) {
 		wACD := n3.Dot(n)
 
 		n = bc.Mul(-1.0).Cross(cd)
+		if n[0] == 0.0 && n[1] == 0.0 && n[2] == 0.0 {
+			isDegenerated = true
+			return
+		}
 		n1 = b.Cross(d)
 		n2 = d.Cross(c)
 		n3 = c.Cross(b)
@@ -484,7 +526,7 @@ func (measure *Measure) updateDistance() {
 	measure.Distance = measure.Direction.Len()
 }
 
-func (measure *Measure) updateTheOthers() {
+func (measure *Measure) updatePoints() {
 	denominator := 0.0
 	for _, vertex := range measure.simplex {
 		denominator += vertex.barycentricCoordinate
@@ -497,7 +539,9 @@ func (measure *Measure) updateTheOthers() {
 			measure.Points[i] = measure.Points[i].Add(measure.ConvexHulls[i][vertex.indices[i]].Mul(denominator * vertex.barycentricCoordinate))
 		}
 	}
+}
 
+func (measure *Measure) updateOns() {
 	measure.Ons = [2]map[int]struct{}{
 		{},
 		{},
diff --git a/Measure_test.go b/Measure_test.go
index 0216d1b..ab93461 100644
--- a/Measure_test.go
+++ b/Measure_test.go
@@ -132,11 +132,77 @@ func TestMeasureNonnegativeDistance_MinError(t *testing.T) {
 	)
 }
 
+func TestMeasureNonnegativeDistance_MinError2(t *testing.T) {
+	testMeasureNonnegativeDistance(
+		t,
+		0.0001794258015537176,
+		[]*mgl64.Vec3{
+			{
+				136.33086399999999,
+				36.325947999999997,
+				100,
+			},
+			{
+				136.33014399999999,
+				36.325048000000002,
+				140,
+			},
+			{
+				136.33086399999999,
+				36.325947999999997,
+				140,
+			},
+		},
+		[]*mgl64.Vec3{
+			{
+				136.33020401000977,
+				36.325498453274292,
+				124,
+			},
+			{
+				136.330246925354,
+				36.325498453274292,
+				124,
+			},
+			{
+				136.330246925354,
+				36.325463878117205,
+				124,
+			},
+			{
+				136.33020401000977,
+				36.325463878117205,
+				124,
+			},
+			{
+				136.33020401000977,
+				36.325498453274292,
+				128,
+			},
+			{
+				136.330246925354,
+				36.325498453274292,
+				128,
+			},
+			{
+				136.330246925354,
+				36.325463878117205,
+				128,
+			},
+			{
+				136.33020401000977,
+				36.325463878117205,
+				128,
+			},
+		},
+	)
+}
+
 func testMeasureNonnegativeDistance(
 	t *testing.T,
 	correctDistance float64,
 	convexHull0, convexHull1 []*mgl64.Vec3,
-	) {
+) {
 	measure := Measure{
 		ConvexHulls: [2][]*mgl64.Vec3{
 			convexHull0,
@@ -155,7 +221,7 @@ func testMeasureNonnegativeDistance(
 func TestMeasureDistance(t *testing.T) {
 	testMeasureDistance(
 		t,
-		-0.8135953914471573,
+		-0.2420013964014458,
 		[]*mgl64.Vec3{
 			{0.0, 5.5, 0.0},
 			{2.3, 1.0, -2.0},
@@ -177,7 +243,7 @@ func TestMeasureDistance(t *testing.T) {
 func TestMeasureDistance_Geodetic(t *testing.T) {
 	testMeasureDistance(
 		t,
-		-8.103902144849304e-05,
+		-4.071827329059758e-05,
 		[]*mgl64.Vec3{
 			{136.243592, 36.294155, 0},
 			{136.243591519521, 36.3058526069559, 0.132705141790211},
@@ -269,7 +335,7 @@ func testMeasureDistance(
 	t *testing.T,
 	correctDistance float64,
 	convexHull0, convexHull1 []*mgl64.Vec3,
-	) {
+) {
 	measure := Measure{
 		ConvexHulls: [2][]*mgl64.Vec3{
 			convexHull0,