diff --git a/org.sat4j.core/src/main/java/org/sat4j/AbstractLauncher.java b/org.sat4j.core/src/main/java/org/sat4j/AbstractLauncher.java
index 6bd7a87655f63a082049fcc8c5fc9c621dcc6b87..f3d76f903fafb77e6fee0e03693e7f234e702978 100644
--- a/org.sat4j.core/src/main/java/org/sat4j/AbstractLauncher.java
+++ b/org.sat4j.core/src/main/java/org/sat4j/AbstractLauncher.java
@@ -117,7 +117,7 @@ public abstract class AbstractLauncher implements Serializable, ILogAble {
         this.launcherMode.setIncomplete(isIncomplete);
     }
 
-    protected AbstractLauncher() {
+    protected void addHook() {
         Runtime.getRuntime().addShutdownHook(this.shutdownHook);
     }
 
diff --git a/org.sat4j.core/src/main/java/org/sat4j/BasicLauncher.java b/org.sat4j.core/src/main/java/org/sat4j/BasicLauncher.java
index 0b483389023cbc987a68df80dcfd33a49616a5fc..93fa2859d5d723537bcfb9ae49c4fef57236bd50 100644
--- a/org.sat4j.core/src/main/java/org/sat4j/BasicLauncher.java
+++ b/org.sat4j.core/src/main/java/org/sat4j/BasicLauncher.java
@@ -69,6 +69,7 @@ public class BasicLauncher<T extends ISolver> extends AbstractLauncher {
             lanceur.usage();
             return;
         }
+        lanceur.addHook();
         lanceur.run(args);
         System.exit(lanceur.getExitCode().value());
     }
diff --git a/org.sat4j.core/src/main/java/org/sat4j/MUSLauncher.java b/org.sat4j.core/src/main/java/org/sat4j/MUSLauncher.java
index 92f87582a7636adcdc5f3a26551c6b02db235bad..f32803f5317874f053a091dd95e8f34df57858a6 100644
--- a/org.sat4j.core/src/main/java/org/sat4j/MUSLauncher.java
+++ b/org.sat4j.core/src/main/java/org/sat4j/MUSLauncher.java
@@ -229,6 +229,7 @@ public class MUSLauncher extends AbstractLauncher {
             lanceur.usage();
             return;
         }
+        lanceur.addHook();
         lanceur.run(args);
         System.exit(lanceur.getExitCode().value());
     }
diff --git a/org.sat4j.maxsat/src/main/java/org/sat4j/maxsat/GenericOptLauncher.java b/org.sat4j.maxsat/src/main/java/org/sat4j/maxsat/GenericOptLauncher.java
index 585e02e778fef91a5361a7cb75d28597926eb8f1..1a5f888603122e247de7e439e8ed821d361cddc8 100644
--- a/org.sat4j.maxsat/src/main/java/org/sat4j/maxsat/GenericOptLauncher.java
+++ b/org.sat4j.maxsat/src/main/java/org/sat4j/maxsat/GenericOptLauncher.java
@@ -232,6 +232,7 @@ public class GenericOptLauncher extends AbstractLauncher {
 
     public static void main(String[] args) {
         AbstractLauncher lanceur = new GenericOptLauncher();
+        lanceur.addHook();
         lanceur.run(args);
     }
 
diff --git a/org.sat4j.pb/src/main/java/org/sat4j/pb/LanceurPseudo2005.java b/org.sat4j.pb/src/main/java/org/sat4j/pb/LanceurPseudo2005.java
index 94942d4cfcf2d695be7c70ab12b746d61e30bde3..2cdc19a21211adcba2d1ecf75e5acb2e8ae17721 100644
--- a/org.sat4j.pb/src/main/java/org/sat4j/pb/LanceurPseudo2005.java
+++ b/org.sat4j.pb/src/main/java/org/sat4j/pb/LanceurPseudo2005.java
@@ -65,8 +65,8 @@ public class LanceurPseudo2005 extends AbstractLauncher implements ILogAble {
     }
 
     /**
-	 * 
-	 */
+     * 
+     */
     private static final long serialVersionUID = 1L;
 
     /**
@@ -78,6 +78,7 @@ public class LanceurPseudo2005 extends AbstractLauncher implements ILogAble {
      */
     public static void main(final String[] args) {
         final AbstractLauncher lanceur = new LanceurPseudo2005();
+        lanceur.addHook();
         lanceur.run(args);
         System.exit(lanceur.getExitCode().value());
     }
@@ -122,8 +123,8 @@ public class LanceurPseudo2005 extends AbstractLauncher implements ILogAble {
                         new ObjectiveReducerPBSolverDecorator(theSolver));
             }
         } else if (System.getProperty("INTERNAL") != null) {
-            theSolver.setSearchListener(new SearchOptimizerListener(
-                    ILauncherMode.DECISION));
+            theSolver.setSearchListener(
+                    new SearchOptimizerListener(ILauncherMode.DECISION));
             setLauncherMode(ILauncherMode.DECISION);
         } else {
             if (lower) {
@@ -141,7 +142,8 @@ public class LanceurPseudo2005 extends AbstractLauncher implements ILogAble {
 
     @Override
     public void usage() {
-        this.out.println("java -jar sat4j-pb.jar [solvername [timeout]] instancename.opb"); //$NON-NLS-1$
+        this.out.println(
+                "java -jar sat4j-pb.jar [solvername [timeout]] instancename.opb"); //$NON-NLS-1$
         showAvailableSolvers(SolverFactory.instance());
     }
 
diff --git a/org.sat4j.sat/src/main/java/org/sat4j/sat/Lanceur.java b/org.sat4j.sat/src/main/java/org/sat4j/sat/Lanceur.java
index 5ae48df479386045607d5a33e5f0b3d94f11da88..8891e87e359b8ea6ee622cfdd62b7b116ef6808d 100644
--- a/org.sat4j.sat/src/main/java/org/sat4j/sat/Lanceur.java
+++ b/org.sat4j.sat/src/main/java/org/sat4j/sat/Lanceur.java
@@ -114,6 +114,7 @@ public class Lanceur extends AbstractLauncher implements ILogAble {
 
     public static void main(final String[] args) {
         lanceur = new Lanceur();
+        lanceur.addHook();
         lanceur.run(args);
 
     }
diff --git a/org.sat4j.sat/src/main/java/org/sat4j/sat/Launcher.java b/org.sat4j.sat/src/main/java/org/sat4j/sat/Launcher.java
index e537654c7faa8178fdce82f0065e866d90b9c848..addd25f97a053b31074ca2fe589ee4be13a6f976 100644
--- a/org.sat4j.sat/src/main/java/org/sat4j/sat/Launcher.java
+++ b/org.sat4j.sat/src/main/java/org/sat4j/sat/Launcher.java
@@ -97,6 +97,7 @@ public class Launcher extends AbstractLauncher implements ILogAble {
 
     public static void main(final String[] args) {
         launcher = new Launcher();
+        launcher.addHook();
         launcher.run(args);
 
     }