diff --git a/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js b/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js
index edddeef3f..a13da7774 100644
--- a/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js
+++ b/Projects/Superalgos/TS/Function-Libraries/NodeJSFunctions.js
@@ -40,7 +40,7 @@ exports.newSuperalgosFunctionLibrariesNodeJSFunctions = function () {
             TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.forEach(forEachLogger)
 
             function forEachLogger(logger) {
-                if (logger !== undefined) {
+                if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) {
                     logger.finalize()
                 }
             }
diff --git a/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js b/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js
index f93bfcfe0..92b26df8e 100644
--- a/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js
+++ b/Projects/Superalgos/TS/Function-Libraries/SessionFunctions.js
@@ -23,7 +23,7 @@ exports.newSuperalgosFunctionLibrariesSessionFunctions = function () {
 
         if (TS.projects.superalgos.globals.taskVariables.IS_TASK_STOPPING === true) {
             TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).IS_SESSION_STOPPING = true
-            if (logger !== undefined) {
+            if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) {
                 logger.write(MODULE_NAME, '[IMPORTANT] sessionHeartBeat -> Stopping the Session now. ')
             }
         }
diff --git a/TaskServer/FileStorage.js b/TaskServer/FileStorage.js
index 9afd0197c..b59f9bd44 100644
--- a/TaskServer/FileStorage.js
+++ b/TaskServer/FileStorage.js
@@ -1,19 +1,22 @@
 
 const path = require('path')
 
-exports.newFileStorage = function newFileStorage(logger, host, port) {
+exports.newFileStorage = function newFileStorage(host, port) {
 
     const MODULE_NAME = 'FileStorage'
     const MAX_RETRY = 10
     const FAST_RETRY_TIME_IN_MILISECONDS = 500
     const SLOW_RETRY_TIME_IN_MILISECONDS = 2000
 
-    if (logger === undefined) { // Dummy logger
+    let logger
+    if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE === undefined) { // Dummy logger
         logger = {}
         function write() {
 
         }
         logger.write = write
+    } else {
+        logger = TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE
     }
 
     let thisObject = {
diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js
index 54027780a..7efca3708 100644
--- a/TaskServer/IndicatorBot.js
+++ b/TaskServer/IndicatorBot.js
@@ -93,7 +93,7 @@
                     }
 
                     /* For each loop we want to create a new log file. */
-                    if (logger !== undefined) {
+                    if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) {
                         logger.finalize()
                     }
                     TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = DEBUG_MODULE.newDebugLog(processIndex)
diff --git a/TaskServer/SensorBot.js b/TaskServer/SensorBot.js
index be4ef5960..35fad6220 100644
--- a/TaskServer/SensorBot.js
+++ b/TaskServer/SensorBot.js
@@ -98,7 +98,7 @@
                     }
 
                     /* For each loop we want to create a new log file. */
-                    if (logger !== undefined) {
+                    if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) {
                         logger.finalize()
                     }
                     TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = DEBUG_MODULE.newDebugLog(processIndex)
diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js
index c04015585..7b171c9d8 100644
--- a/TaskServer/TradingBot.js
+++ b/TaskServer/TradingBot.js
@@ -55,7 +55,7 @@
                     }
 
                     /* For each loop we want to create a new log file. */
-                    if (logger !== undefined) {
+                    if (TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE !== undefined) {
                         logger.finalize()
                     }
                     TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE = DEBUG_MODULE.newDebugLog(processIndex)