diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 4fd3cedddfd1e187a431313c5242a831b7306fc3..be7010878a09f229cbf6733f68ab27827cba6e68 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -706,11 +706,17 @@ public class Rugged {
         // ==================
         // Initialization
         // --------------
+        // Deactivate the dump because no need to keep intermediate computations of inverse loc (can be regenerate)
+        final Boolean wasSuspended = DumpManager.suspend();
+
         // compute the sensor pixel on the desired ground point WITHOUT atmosphere
         atmosphericRefraction.deactivateComputation();
         final SensorPixel sp0 = inverseLocation(sensorName, point, minLine, maxLine);
         atmosphericRefraction.reactivateComputation();
 
+        // Reactivate the dump
+        DumpManager.resume(wasSuspended);
+
         if (sp0 == null) {
             // Impossible to find the point in the given min line and max line (without atmosphere)
             throw new RuggedException(RuggedMessages.INVALID_RANGE_FOR_LINES, minLine, maxLine, "");
@@ -746,6 +752,8 @@ public class Rugged {
         }
         // The sensor pixel is found !
         final SensorPixel sensorPixelWithAtmosphere = new SensorPixel(corrLinePrevious, corrPixelPrevious);
+
+        // Dump the found sensorPixel
         DumpManager.dumpInverseLocationResult(sensorPixelWithAtmosphere);
 
         return sensorPixelWithAtmosphere;
@@ -766,6 +774,9 @@ public class Rugged {
                                                                      final int nbPixelGrid, final int nbLineGrid,
                                                                      final LineSensor sensor, final int minLine, final int maxLine) {
 
+        // Deactivate the dump because no need to keep intermediate computations of inverse loc (can be regenerate)
+        final Boolean wasSuspended = DumpManager.suspend();
+
         final SensorPixel[][] sensorPixelGrid = new SensorPixel[nbPixelGrid][nbLineGrid];
         final String sensorName = sensor.getName();
 
@@ -804,6 +815,9 @@ public class Rugged {
             } // end loop vIndex
         } // end loop uIndex
 
+        // Reactivate the dump
+        DumpManager.resume(wasSuspended);
+
         // The sensor grid computed WITHOUT atmospheric refraction correction
         return sensorPixelGrid;
     }
@@ -819,6 +833,9 @@ public class Rugged {
     private GeodeticPoint[][] computeDirectLocOnGridWithAtmosphere(final double[] pixelGrid, final double[] lineGrid,
                                                                    final LineSensor sensor) {
 
+        // Deactivate the dump because no need to keep intermediate computations of direct loc (can be regenerate)
+        final Boolean wasSuspended = DumpManager.suspend();
+
         final int nbPixelGrid = pixelGrid.length;
         final int nbLineGrid = lineGrid.length;
         final GeodeticPoint[][] groundGridWithAtmosphere = new GeodeticPoint[nbPixelGrid][nbLineGrid];
@@ -840,6 +857,9 @@ public class Rugged {
             } // end loop vIndex
         } // end loop uIndex
 
+        // Reactivate the dump
+        DumpManager.resume(wasSuspended);
+
         // The ground grid computed WITH atmospheric refraction correction
         return groundGridWithAtmosphere;
     }
diff --git a/src/main/java/org/orekit/rugged/errors/DumpManager.java b/src/main/java/org/orekit/rugged/errors/DumpManager.java
index 189aea8a522c1ff3255edb357e6f73db9d7a2daf..d275d9df373b08e62645f3a92bbaa710b7ccc47e 100644
--- a/src/main/java/org/orekit/rugged/errors/DumpManager.java
+++ b/src/main/java/org/orekit/rugged/errors/DumpManager.java
@@ -86,15 +86,25 @@ public class DumpManager {
     }
 
     /** Suspend the dump.
+     * In case the dump is already suspended, keep the previous status in order to 
+     * correctly deal the resume stage.
      */
-    public static void suspend() {
-        isSuspended = true;
+    public static Boolean suspend() {
+        // Check if the dump is already suspended
+        if (isSuspended) {
+            return isSuspended;
+        } else {
+            isSuspended = true;
+            return false;
+        }
     }
 
-    /** Resume the dump.
+    /** Resume the dump, only if it was not already suspended.
      */
-    public static void resume() {
-        isSuspended = false;
+    public static void resume(Boolean wasSuspended) {
+        if (!wasSuspended) {
+            isSuspended = false;
+        }
     }
 
     /** Check if dump is active for this thread.