diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index 0f63927..785b6b2 100644
--- a/src/mappings/erc20Templates.ts
+++ b/src/mappings/erc20Templates.ts
@@ -109,7 +109,12 @@ export function handleOrderStarted(event: OrderStarted): void {
 }
 
 export function handlerOrderReused(event: OrderReused): void {
-  const order = searchOrderForEvent(event)
+  const order = searchOrderForEvent(
+    event.transaction.hash.toHex(),
+    event.address.toHex(),
+    event.transaction.from.toHex(),
+    event.logIndex.toI32()
+  )
 
   if (!order) return
 
@@ -245,15 +250,26 @@ export function handleProviderFee(event: ProviderFee): void {
   }", "r": "${event.params.r.toHexString()}", "s": "${event.params.s.toHexString()}", "validUntil": "${
     event.params.validUntil
   }"}`
+  log.info('provider fee: {}', [providerFee])
+  log.info('event address: {}', [event.address.toHexString()])
 
-  const order = searchOrderForEvent(event)
+  const order = searchOrderForEvent(
+    event.transaction.hash.toHex(),
+    event.address.toHex(),
+    event.transaction.from.toHex(),
+    event.logIndex.toI32()
+  )
 
   if (order) {
     order.providerFee = providerFee
     order.providerFeeValidUntil = event.params.validUntil
     order.save()
   } else {
-    const orderReuse = searchOrderResusedForEvent(event)
+    const orderReuse = searchOrderResusedForEvent(
+      event.transaction.hash.toHex(),
+      event.address.toHex(),
+      event.logIndex.toI32()
+    )
     if (orderReuse) {
       orderReuse.providerFee = providerFee
       orderReuse.providerFeeValidUntil = event.params.validUntil
diff --git a/src/mappings/utils/orderUtils.ts b/src/mappings/utils/orderUtils.ts
index c7a0bd6..41fddd4 100644
--- a/src/mappings/utils/orderUtils.ts
+++ b/src/mappings/utils/orderUtils.ts
@@ -1,5 +1,5 @@
 import { Order, OrderReuse } from '../../@types/schema'
-import { ethereum, log } from '@graphprotocol/graph-ts'
+import { log } from '@graphprotocol/graph-ts'
 
 export function getOrderId(
   tx: string,
@@ -34,49 +34,65 @@ export function getOrder(
   return newOrder
 }
 
-export function searchOrderForEvent(event: ethereum.Event): Order {
-  let firstEventIndex = event.logIndex.toI32() - 1
-  log.info('firstEventIndex on simple order: ', [firstEventIndex.toString()])
-  while (true) {
+export function searchOrderForEvent(
+  transactionHash: string,
+  address: string,
+  transactionFrom: string,
+  eventIndex: number
+): Order {
+  let firstEventIndex = eventIndex - 1
+
+  log.info('firstEventIndex on simple order: {}', [
+    firstEventIndex.toString().replace('0.0', '0')
+  ])
+  while (firstEventIndex >= 0) {
     const orderId = getOrderId(
-      event.transaction.hash.toHex(),
-      event.address.toHex(),
-      event.transaction.from.toHex(),
-      firstEventIndex.toString()
+      transactionHash,
+      address,
+      transactionFrom,
+      firstEventIndex.toString().replace('0.0', '0')
     )
-    log.info('orderId as trial: ', [orderId])
+    log.info('orderId as trial: {}', [orderId])
     const order = Order.load(orderId)
     if (order !== null) {
-      log.info('order datatoken: ', [order.datatoken])
+      log.info('order datatoken: {}', [order.datatoken])
     }
-    log.info('event address: ', [event.address.toString()])
-    if (order !== null && order.datatoken === event.address.toString()) {
+    log.info('event address: {}', [address])
+    if (order !== null && order.datatoken === address) {
       return order
     }
     firstEventIndex--
   }
+  return getOrder(
+    transactionHash,
+    address,
+    transactionFrom,
+    firstEventIndex.toString().replace('0.0', '0')
+  )
 }
 
-export function searchOrderResusedForEvent(event: ethereum.Event): OrderReuse {
-  let firstEventIndex = event.logIndex.toI32() - 1
-  log.info('firstEventIndex on simple order: ', [firstEventIndex.toString()])
-  while (true) {
-    const orderReused = OrderReuse.load(
-      `${event.transaction.hash.toHex()}-${firstEventIndex}`
-    )
+export function searchOrderResusedForEvent(
+  transactionHash: string,
+  eventAddress: string,
+  eventIndex: number
+): OrderReuse {
+  let firstEventIndex = eventIndex - 1
+  log.info('firstEventIndex on simple order: {}', [firstEventIndex.toString()])
+  while (firstEventIndex >= 0) {
+    const orderReused = OrderReuse.load(`${transactionHash}-${firstEventIndex}`)
 
     if (orderReused !== null) {
-      log.info('order reused order: ', [orderReused.order])
+      log.info('order reused order: {}', [orderReused.order])
       const order = Order.load(orderReused.order)
       if (order !== null) {
         log.info('order datatoken: ', [order.datatoken])
       }
-      log.info('event address: ', [event.address.toString()])
+      log.info('event address: {}', [eventAddress])
 
       if (
         orderReused !== null &&
         order !== null &&
-        order.datatoken === event.address.toString()
+        order.datatoken === eventAddress
       ) {
         return orderReused
       }
@@ -84,4 +100,5 @@ export function searchOrderResusedForEvent(event: ethereum.Event): OrderReuse {
 
     firstEventIndex--
   }
+  return new OrderReuse(`${transactionHash}-${eventIndex.toString()}`)
 }
diff --git a/test/integration/SimplePublishConsume.test.ts b/test/integration/SimplePublishConsume.test.ts
index a3ab905..e72c689 100644
--- a/test/integration/SimplePublishConsume.test.ts
+++ b/test/integration/SimplePublishConsume.test.ts
@@ -320,7 +320,7 @@ describe('Simple Publish & consume test', async () => {
       method: 'POST',
       body: JSON.stringify(query)
     })
-    await sleep(6000)
+    await sleep(3000)
     const queryResult = await response.json()
     console.log('queryResult: ', queryResult)