diff --git a/src/MissionManager/ComplexMissionItemTest.cc b/src/MissionManager/ComplexMissionItemTest.cc
index af870910b936f127486777874e5dc3a7af72c762..6d446ded7083c177170f6778d52f06c76a9bac9b 100644
--- a/src/MissionManager/ComplexMissionItemTest.cc
+++ b/src/MissionManager/ComplexMissionItemTest.cc
@@ -137,6 +137,14 @@ void ComplexMissionItemTest::_testAddPolygonCoordinate(void)
     for (int i=0; i<polyList.count(); i++) {
         QCOMPARE(polyList[i].value<QGeoCoordinate>(), _polyPoints[i]);
     }
+
+    // Test that number of waypoints is doubled when using turnaround waypoints
+    _complexItem->setTurnaroundDist(60.0);
+    QVariantList gridPoints = _complexItem->gridPoints();
+    _complexItem->setTurnaroundDist(0.0);
+    QVariantList gridPointsNoT = _complexItem->gridPoints();
+    QCOMPARE(gridPoints.count(), 2 * gridPointsNoT.count());
+
 }
 
 void ComplexMissionItemTest::_testClearPolygon(void)
diff --git a/src/MissionManager/SurveyMissionItem.h b/src/MissionManager/SurveyMissionItem.h
index facaddb075fd3c606bf6a0945e3c69496d81c6d4..3580fc0b5713c755084c83db31a5fef0c7f5f27e 100644
--- a/src/MissionManager/SurveyMissionItem.h
+++ b/src/MissionManager/SurveyMissionItem.h
@@ -83,6 +83,7 @@ public:
     void setDirty           (bool dirty) final;
     void setCoordinate      (const QGeoCoordinate& coordinate) final;
     void setSequenceNumber  (int sequenceNumber) final;
+    void setTurnaroundDist  (double dist) { _turnaroundDistFact.setRawValue(dist); }
     void save               (QJsonObject& saveObject) const final;
 
 signals: