diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index 03b0858..2fb601b 100644
--- a/src/mappings/erc20Templates.ts
+++ b/src/mappings/erc20Templates.ts
@@ -261,7 +261,7 @@ export function handleProviderFee(event: ProviderFee): void {
     event.params.validUntil
   }"}`
   log.info('event address in provider fee handler: {}', [
-    event.address.toString()
+    event.address.toHexString()
   ])
 
   const order = searchOrderForEvent(
diff --git a/src/mappings/utils/orderUtils.ts b/src/mappings/utils/orderUtils.ts
index 020526b..e0502c1 100644
--- a/src/mappings/utils/orderUtils.ts
+++ b/src/mappings/utils/orderUtils.ts
@@ -53,7 +53,12 @@ export function searchOrderForEvent(
     }
   }
   // return an Order just for compilation schema
-  return getOrder(transactionHash, address, transactionFrom, eventIndex)
+  let tempEventIndex = eventIndex - 1
+  log.info('return the default order: {}', [tempEventIndex.toString()])
+  if (tempEventIndex < 0) {
+    tempEventIndex = eventIndex
+  }
+  return getOrder(transactionHash, address, transactionFrom, tempEventIndex)
 }
 
 export function searchOrderReusedForEvent(
diff --git a/test/integration/SimplePublishConsume.test.ts b/test/integration/SimplePublishConsume.test.ts
index ad2399b..89b74b8 100644
--- a/test/integration/SimplePublishConsume.test.ts
+++ b/test/integration/SimplePublishConsume.test.ts
@@ -466,11 +466,7 @@ describe('Simple Publish & consume test', async () => {
     // Check the new provider fee has been set in OrderReuse
 
     const reuseQuery = {
-      query: `query {orderReuse(id:"${
-        reusedOrder.transactionHash
-      }-${reusedOrder.events.OrderReused.logIndex.toFixed(
-        1
-      )}"){id, providerFee, eventIndex}}`
+      query: `query {orderReuse(id:"${reusedOrder.transactionHash}-${reusedOrder.events.OrderReused.logIndex}"){id, providerFee, eventIndex}}`
     }
 
     await sleep(2000)