diff --git a/js/waypointCollection.js b/js/waypointCollection.js
index 949e9826..86f44406 100644
--- a/js/waypointCollection.js
+++ b/js/waypointCollection.js
@@ -335,6 +335,7 @@ let WaypointCollection = function () {
     self.getDistance = function() {
         let point2measure = []
         let lengthLine = []
+        let jumpDict = {};
         let nStart = 0;
         let nLoop = 0;
         let n = 0 ;
@@ -350,15 +351,27 @@ let WaypointCollection = function () {
                 nStart++;
             }
             else if (self.getWaypoint(nStart).getAction() == MWNP.WPTYPE.JUMP) {
-                if ((n>=nLoop && nLoop != 0) || self.getWaypoint(nStart).getP2() == 0) {
-                    nStart++;
-                    n = 0;
+                console.log("TITI"); 
+                console.log(jumpDict);
+                if (!Object.keys(jumpDict).includes(self.getWaypoint(nStart).getNumber()) ) {
+                    jumpDict[self.getWaypoint(nStart).getNumber()] = {nStart: self.getWaypoint(nStart).getP1(), nLoop : self.getWaypoint(nStart).getP2(), n : 0};
                 }
-                else {
-                    nLoop = self.getWaypoint(nStart).getP2();
-                    nStart = self.getWaypoint(nStart).getP1();
-                    n++; 
+                console.log(jumpDict);
+                if (Object.keys(jumpDict).includes(String(self.getWaypoint(nStart).getNumber())) ) {
+                    console.log("TOTO");
+                    console.log((jumpDict[self.getWaypoint(nStart).getNumber()]["n"]>=jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"]  || jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] == 0));
+                    if ( (jumpDict[self.getWaypoint(nStart).getNumber()]["n"]>=jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"]  || jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] ==0) ) {
+                        nStart++;
+                        //jumpDict[self.getWaypoint(nStart).getNumber()]["n"] = 0;
+                    }
+                    else {
+                        jumpDict[self.getWaypoint(nStart).getNumber()]["n"]++;
+                        console.log(jumpDict[self.getWaypoint(nStart).getNumber()]["nStart"]);
+                        //nStart = 0; //jumpDict[self.getWaypoint(nStart).getNumber()]["nStart"];
+                    }
                 }
+                //nStart++;
+                console.log(jumpDict);
             }
             else {
                 nStart++;
diff --git a/tabs/mission_control.js b/tabs/mission_control.js
index 2bb6694a..89964dbb 100644
--- a/tabs/mission_control.js
+++ b/tabs/mission_control.js
@@ -751,8 +751,8 @@ TABS.mission_control.initialize = function (callback) {
         if (textGeom) {
             textGeom.setCoordinates(map.getCoordinateFromPixel([0,0]));
         }
-        //let lengthMission = mission.getDistance();
-        //$('#missionDistance').text(lengthMission[lengthMission.length -1] != -1 ? lengthMission[lengthMission.length -1].toFixed(1) : 'infinite');
+        let lengthMission = mission.getDistance();
+        $('#missionDistance').text(lengthMission[lengthMission.length -1] != -1 ? lengthMission[lengthMission.length -1].toFixed(1) : 'infinite');
     }
     
     function paintLine(pos1, pos2, pos2ID, color='#1497f1', lineDash=0, lineText="", selection=true) {