diff --git a/trainer/src/Trainer.cpp b/trainer/src/Trainer.cpp
index f33d5387c895130ca7fe6b1cc33360b03f16cc1c..1c8ed8ac7509015e62567f9673a35414d02fe998 100644
--- a/trainer/src/Trainer.cpp
+++ b/trainer/src/Trainer.cpp
@@ -28,12 +28,18 @@ void Trainer::setDebugValue()
   if (!ProgramParameters::randomDebug)
     return;
 
+  ProgramParameters::debug = choiceWithProbability(ProgramParameters::randomDebugProbability);
+
+  if (!ProgramParameters::debug)
+    return;
+
   if (ProgramParameters::interactive)
     fprintf(stderr, "                            \r");
+
+  fprintf(stderr, "\n");
+
   if (ProgramParameters::printTime)
     fprintf(stderr, "[%s] :\n", getTime().c_str());
-
-  ProgramParameters::debug = choiceWithProbability(ProgramParameters::randomDebugProbability);
 }
 
 void Trainer::computeScoreOnDev()
@@ -58,6 +64,7 @@ void Trainer::computeScoreOnDev()
 
   while (!devConfig->isFinal())
   {
+    setDebugValue();
     devConfig->setCurrentStateName(tm.getCurrentState());
     Dict::currentClassifierName = tm.getCurrentClassifier()->name;
     tm.getCurrentClassifier()->initClassifier(*devConfig);
@@ -464,6 +471,7 @@ void Trainer::train()
     resetAndShuffle();
     while (!trainConfig.isFinal())
     {
+      setDebugValue();
       trainConfig.setCurrentStateName(tm.getCurrentState());
       Dict::currentClassifierName = tm.getCurrentClassifier()->name;
       tm.getCurrentClassifier()->initClassifier(trainConfig);
diff --git a/transition_machine/include/Config.hpp b/transition_machine/include/Config.hpp
index 604d9ea67f52bc5ba7c2b920b23cb1be41179aa3..de3dd7a1792343e9f35f099e0c67ae9f9cba92b8 100644
--- a/transition_machine/include/Config.hpp
+++ b/transition_machine/include/Config.hpp
@@ -134,7 +134,7 @@ class Config
 
   private :
 
-  const unsigned int HISTORY_SIZE = 1000000;
+  const unsigned int HISTORY_SIZE = 100000000;
   /// @brief The name of the current state of the TransitionMachine.
   std::string currentStateName;
   /// @brief For each state of the TransitionMachine, an history of the Action that have been applied to this Config.