diff --git a/src/DailyFiles.js b/src/DailyFiles.js
index decef072c..f28017eb2 100644
--- a/src/DailyFiles.js
+++ b/src/DailyFiles.js
@@ -209,6 +209,7 @@ function newDailyFiles() {
               }
             }
           }
+          callBackWhenFileReceived(GLOBAL.DEFAULT_OK_RESPONSE, thisObject)
         } catch (err) {
           if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> loadThemAll -> err = ' + err.stack) }
           callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE)
diff --git a/src/MarketFiles.js b/src/MarketFiles.js
index 1a59120cd..e399df108 100644
--- a/src/MarketFiles.js
+++ b/src/MarketFiles.js
@@ -1,5 +1,5 @@
- 
-function newMarketFiles () {
+
+function newMarketFiles() {
   const MODULE_NAME = 'Market Files'
   const ERROR_LOG = true
   const logger = newWebDebugLog()
@@ -42,7 +42,7 @@ function newMarketFiles () {
 
   return thisObject
 
-  function finalize () {
+  function finalize() {
     try {
       for (let i = 0; i < eventSubscriptionIdDatasetUpdated.length; i++) {
         eventsServerClient.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated[i])
@@ -70,7 +70,7 @@ function newMarketFiles () {
     }
   }
 
-  function initialize (
+  function initialize(
     pDataMine,
     pBot,
     pSession,
@@ -107,11 +107,11 @@ function newMarketFiles () {
 
       getTimeFramesFile()
 
-      function getTimeFramesFile () {
+      function getTimeFramesFile() {
         /* First we will get the Data Range */
         fileCloud.getFile(pDataMine, pBot, pSession, pProduct, pDataset, exchange, pMarket, undefined, undefined, undefined, undefined, true, onTimeFramesReceived)
 
-        function onTimeFramesReceived (err, pFile) {
+        function onTimeFramesReceived(err, pFile) {
           switch (err.result) {
             case GLOBAL.DEFAULT_OK_RESPONSE.result: {
               timeFrames = pFile
@@ -147,7 +147,7 @@ function newMarketFiles () {
         }
       }
 
-      function getMarketFiles () {
+      function getMarketFiles() {
         /* Now we will get the market files */
         for (let i = 0; i < marketFilesPeriods.length; i++) {
           let periodTime = marketFilesPeriods[i][0]
@@ -167,7 +167,7 @@ function newMarketFiles () {
           filesExpected++
           fileCloud.getFile(dataMine, bot, session, product, dataset, exchange, market, periodName, undefined, undefined, undefined, undefined, onFileReceived)
 
-          function onFileReceived (err, file) {
+          function onFileReceived(err, file) {
             try {
               if (finalized === true) { return }
               if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) {
@@ -184,7 +184,7 @@ function newMarketFiles () {
 
                 callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject)
 
-                function onResponse (message) {
+                function onResponse(message) {
                   eventSubscriptionIdDatasetUpdated.push(message.eventSubscriptionId)
                 }
               }
@@ -194,6 +194,8 @@ function newMarketFiles () {
             }
           }
         }
+
+        callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject)
       }
     } catch (err) {
       if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = ' + err.stack) }
@@ -201,13 +203,13 @@ function newMarketFiles () {
     }
   }
 
-  function updateFiles (message) {
+  function updateFiles(message) {
     try {
       if (finalized === true) { return }
       let updatedFiles = 0
       if (message.event === undefined) { return }
 
-            /* Now we will get the market files */
+      /* Now we will get the market files */
 
       for (let i = 0; i < marketFilesPeriods.length; i++) {
         let periodTime = marketFilesPeriods[i][0]
@@ -219,7 +221,7 @@ function newMarketFiles () {
         }
         fileCloud.getFile(dataMine, bot, session, product, dataset, exchange, market, periodName, undefined, undefined, undefined, undefined, onFileReceived)
 
-        function onFileReceived (err, file) {
+        function onFileReceived(err, file) {
           try {
             if (finalized === true) { return }
             files.set(periodTime, file)
@@ -238,19 +240,19 @@ function newMarketFiles () {
     }
   }
 
-  function getFile (pPeriod) {
+  function getFile(pPeriod) {
     return files.get(pPeriod)
   }
 
-  function getExpectedFiles () {
+  function getExpectedFiles() {
     return marketFilesPeriods.length
   }
 
-  function getFilesLoaded () {
+  function getFilesLoaded() {
     return filesLoaded
   }
 
-  function getFilesNotLoaded () {
+  function getFilesNotLoaded() {
     return filesNotLoaded
   }
 }