diff --git a/packages/codegen/src/templates/indexer-template.handlebars b/packages/codegen/src/templates/indexer-template.handlebars
index e37b9090..0a5e021f 100644
--- a/packages/codegen/src/templates/indexer-template.handlebars
+++ b/packages/codegen/src/templates/indexer-template.handlebars
@@ -545,7 +545,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
diff --git a/packages/eden-watcher/src/indexer.ts b/packages/eden-watcher/src/indexer.ts
index 61affc11..3cd74e47 100644
--- a/packages/eden-watcher/src/indexer.ts
+++ b/packages/eden-watcher/src/indexer.ts
@@ -472,7 +472,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
diff --git a/packages/erc20-watcher/src/indexer.ts b/packages/erc20-watcher/src/indexer.ts
index 1b59b060..a958b238 100644
--- a/packages/erc20-watcher/src/indexer.ts
+++ b/packages/erc20-watcher/src/indexer.ts
@@ -404,7 +404,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
diff --git a/packages/erc721-watcher/src/indexer.ts b/packages/erc721-watcher/src/indexer.ts
index d6752622..d7b5c7ca 100644
--- a/packages/erc721-watcher/src/indexer.ts
+++ b/packages/erc721-watcher/src/indexer.ts
@@ -842,7 +842,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
diff --git a/packages/graph-test-watcher/src/indexer.ts b/packages/graph-test-watcher/src/indexer.ts
index e7b7be50..333f2479 100644
--- a/packages/graph-test-watcher/src/indexer.ts
+++ b/packages/graph-test-watcher/src/indexer.ts
@@ -477,7 +477,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
diff --git a/packages/mobymask-watcher/src/indexer.ts b/packages/mobymask-watcher/src/indexer.ts
index b4999d8e..0389ab6a 100644
--- a/packages/mobymask-watcher/src/indexer.ts
+++ b/packages/mobymask-watcher/src/indexer.ts
@@ -569,7 +569,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async getBlockEvents (blockHash: string, where: Where, queryOptions: QueryOptions): Promise<Array<Event>> {
diff --git a/packages/util/src/common.ts b/packages/util/src/common.ts
index 464b731f..f0ec8a7b 100644
--- a/packages/util/src/common.ts
+++ b/packages/util/src/common.ts
@@ -196,7 +196,9 @@ export const _fetchBatchBlocks = async (
     block.blockTimestamp = block.timestamp;
 
     try {
+      log(`_fetchBatchBlocks#saveBlockAndFetchEvents: fetching from upstream server ${block.blockHash}`);
       const [blockProgress, events] = await indexer.saveBlockAndFetchEvents(block);
+      log(`_fetchBatchBlocks#saveBlockAndFetchEvents: fetched for block: ${blockProgress.blockHash} num events: ${blockProgress.numEvents}`);
       return { blockProgress, events };
     } catch (error) {
       log(error);
diff --git a/packages/util/src/indexer.ts b/packages/util/src/indexer.ts
index f1529407..a5e8c3c3 100644
--- a/packages/util/src/indexer.ts
+++ b/packages/util/src/indexer.ts
@@ -263,16 +263,6 @@ export class Indexer {
     return this._db.getEvent(id);
   }
 
-  async saveBlockAndFetchEvents (block: DeepPartial<BlockProgressInterface>, saveBlockAndFetchEvents: (block: DeepPartial<BlockProgressInterface>) => Promise<[BlockProgressInterface, DeepPartial<EventInterface>[]]>): Promise<[BlockProgressInterface, DeepPartial<EventInterface>[]]> {
-    assert(block.blockHash);
-
-    log(`getBlockEvents: fetching from upstream server ${block.blockHash}`);
-    const [blockProgress, events] = await saveBlockAndFetchEvents(block);
-    log(`getBlockEvents: fetched for block: ${blockProgress.blockHash} num events: ${blockProgress.numEvents}`);
-
-    return [blockProgress, events];
-  }
-
   async fetchEvents (blockHash: string, blockNumber: number, parseEventNameAndArgs: (kind: string, logObj: any) => any): Promise<DeepPartial<EventInterface>[]> {
     let logsPromise: Promise<any>;
 
diff --git a/packages/util/src/job-runner.ts b/packages/util/src/job-runner.ts
index 8dfb3c37..420d47a5 100644
--- a/packages/util/src/job-runner.ts
+++ b/packages/util/src/job-runner.ts
@@ -362,7 +362,9 @@ export class JobRunner {
         await wait(jobDelayInMilliSecs);
 
         console.time('time:job-runner#_indexBlock-saveBlockAndFetchEvents');
+        log(`_indexBlock#saveBlockAndFetchEvents: fetching from upstream server ${blockHash}`);
         [blockProgress] = await this._indexer.saveBlockAndFetchEvents({ cid, blockHash, blockNumber, parentHash, blockTimestamp });
+        log(`_indexBlock#saveBlockAndFetchEvents: fetched for block: ${blockProgress.blockHash} num events: ${blockProgress.numEvents}`);
         console.timeEnd('time:job-runner#_indexBlock-saveBlockAndFetchEvents');
 
         this._blockAndEventsMap.set(blockHash, { block: blockProgress, events: [] });