diff --git a/src/FileCursor.js b/src/FileCursor.js
index d35cad879..d1bede545 100644
--- a/src/FileCursor.js
+++ b/src/FileCursor.js
@@ -44,8 +44,8 @@ function newFileCursor () {
 
   function finalize () {
     try {
-      systemEventHandler.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated)
-      systemEventHandler.stopListening('Data Range Updated', eventSubscriptionIdDataRangeUpdated)
+      eventsServerClient.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated)
+      eventsServerClient.stopListening('Data Range Updated', eventSubscriptionIdDataRangeUpdated)
 
       thisObject.eventHandler = undefined
 
@@ -90,10 +90,10 @@ function newFileCursor () {
       endDateRange = pEndDateRange
 
       let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-      systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponseDataSet, updateFiles)
+      eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponseDataSet, updateFiles)
 
       key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-      systemEventHandler.listenToEvent(key, 'Data Range Updated', undefined, key, onResponseDataRange, updateDataRange)
+      eventsServerClient.listenToEvent(key, 'Data Range Updated', undefined, key, onResponseDataRange, updateDataRange)
 
       callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
 
diff --git a/src/FileSequence.js b/src/FileSequence.js
index d06eb5bc1..feedf0b32 100644
--- a/src/FileSequence.js
+++ b/src/FileSequence.js
@@ -37,7 +37,7 @@ function newFileSequence () {
 
   function finalize () {
     try {
-      systemEventHandler.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated)
+      eventsServerClient.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated)
 
       thisObject.eventHandler.finalize()
       thisObject.eventHandler = undefined
@@ -75,7 +75,7 @@ function newFileSequence () {
       callerId = newUniqueId()
 
       let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-      systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles)
+      eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles)
 
       function onResponse (message) {
         eventSubscriptionIdDatasetUpdated = message.eventSubscriptionId
diff --git a/src/MarketFiles.js b/src/MarketFiles.js
index 1954bc5e9..734314cfd 100644
--- a/src/MarketFiles.js
+++ b/src/MarketFiles.js
@@ -43,7 +43,7 @@ function newMarketFiles () {
   function finalize () {
     try {
       for (let i = 0; i < eventSubscriptionIdDatasetUpdated.length; i++) {
-        systemEventHandler.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated[i])
+        eventsServerClient.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated[i])
       }
 
       thisObject.eventHandler.finalize()
@@ -109,7 +109,7 @@ function newMarketFiles () {
 
               if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) {
                 let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset
-                systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles)
+                eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles)
 
                 callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject)