diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index f99e3ac..3d3496e 100644
--- a/src/mappings/erc20Templates.ts
+++ b/src/mappings/erc20Templates.ts
@@ -263,7 +263,7 @@ export function handleProviderFee(event: ProviderFee): void {
 
   const order = searchOrderForEvent(
     event.transaction.hash.toHex(),
-    event.address.toHex(),
+    event.address.toHexString(),
     event.transaction.from.toHex(),
     event.logIndex.toI32()
   )
@@ -275,7 +275,7 @@ export function handleProviderFee(event: ProviderFee): void {
   } else {
     const orderReuse = searchOrderResusedForEvent(
       event.transaction.hash.toHex(),
-      event.address.toHex(),
+      event.address.toHexString(),
       event.logIndex.toI32()
     )
     if (orderReuse) {
diff --git a/src/mappings/utils/orderUtils.ts b/src/mappings/utils/orderUtils.ts
index e7a3e65..2bc1b5a 100644
--- a/src/mappings/utils/orderUtils.ts
+++ b/src/mappings/utils/orderUtils.ts
@@ -52,7 +52,10 @@ export function searchOrderForEvent(
     )
     log.info('orderId as trial: {}', [orderId])
     const order = Order.load(orderId)
-    if (order !== null && order.datatoken === address) {
+    if (
+      order !== null &&
+      order.datatoken.toLowerCase() === address.toLowerCase()
+    ) {
       log.info('order datatoken: {}', [order.datatoken])
       return order
     }
@@ -74,7 +77,10 @@ export function searchOrderResusedForEvent(
 
     if (orderReused !== null) {
       const order = Order.load(orderReused.order)
-      if (order !== null && order.datatoken === eventAddress) {
+      if (
+        order !== null &&
+        order.datatoken.toLowerCase() === eventAddress.toLowerCase()
+      ) {
         return orderReused
       }
     }