diff --git a/src/MissionManager/CorridorScanComplexItem.cc b/src/MissionManager/CorridorScanComplexItem.cc
index 2da7239fefbe6f0ee72ba03b30a0181d6261b6f6..174c6f570edcca25fa3e33c4f5c11847894a9a03 100644
--- a/src/MissionManager/CorridorScanComplexItem.cc
+++ b/src/MissionManager/CorridorScanComplexItem.cc
@@ -380,9 +380,11 @@ void CorridorScanComplexItem::_rebuildTransectsPhase1(void)
                 // Extend the transect ends for turnaround
                 double azimuth = transect[0].azimuthTo(transect[1]);
                 extensionCoord = transect[0].atDistanceAndAzimuth(-_turnAroundDistanceFact.rawValue().toDouble(), azimuth);
+                extensionCoord.setAltitude(qQNaN());
                 transect.prepend(extensionCoord);
                 azimuth = transect.last().azimuthTo(transect[transect.count() - 2]);
                 extensionCoord = transect.last().atDistanceAndAzimuth(-_turnAroundDistanceFact.rawValue().toDouble(), azimuth);
+                extensionCoord.setAltitude(qQNaN());
                 transect.append(extensionCoord);
             }
 
diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc
index e95abe728f003b8a6be045b1a776cf9596e57b53..abc2f8ab28bf433cfe543b1d2701b5292451b2cf 100644
--- a/src/MissionManager/TransectStyleComplexItem.cc
+++ b/src/MissionManager/TransectStyleComplexItem.cc
@@ -388,11 +388,16 @@ void TransectStyleComplexItem::_adjustTransectPointsForTerrain(void)
 
     // Take care of last point
     QGeoCoordinate transectPoint = _transectPoints.last().value<QGeoCoordinate>();
+    bool surveyEdgeIndicator = transectPoint.altitude() == _surveyEdgeIndicator;
     if (_followTerrain){
         transectPoint.setAltitude(_transectsPathHeightInfo.last().rgHeight.last() + altitude);
     } else {
         transectPoint.setAltitude(altitude);
     }
+    if (surveyEdgeIndicator) {
+        // Use to indicate survey edge
+        transectPoint.setAltitude(-transectPoint.altitude());
+    }
     _transectPoints[_transectPoints.count() - 1] = QVariant::fromValue(transectPoint);
 }