diff --git a/package-lock.json b/package-lock.json
index 561a80d..c4a758d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,8 @@
       "dependencies": {
         "@oceanprotocol/contracts": "^1.1.12",
         "@oceanprotocol/lib": "^2.7.0",
-        "cross-fetch": "^3.1.4"
+        "cross-fetch": "^3.1.4",
+        "ethereumjs-util": "^7.1.5"
       },
       "devDependencies": {
         "@graphprotocol/graph-cli": "^0.38.0",
diff --git a/package.json b/package.json
index 3961b79..dcfcd6c 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,8 @@
   "dependencies": {
     "@oceanprotocol/contracts": "^1.1.12",
     "@oceanprotocol/lib": "^2.7.0",
-    "cross-fetch": "^3.1.4"
+    "cross-fetch": "^3.1.4",
+    "ethereumjs-util": "^7.1.5"
   },
   "repository": {
     "type": "git",
diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index 1e55c59..f99e3ac 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.toString(),
+    event.address.toHex(),
     event.transaction.from.toHex(),
     event.logIndex.toI32()
   )
diff --git a/src/mappings/utils/orderUtils.ts b/src/mappings/utils/orderUtils.ts
index 217610a..246cdb3 100644
--- a/src/mappings/utils/orderUtils.ts
+++ b/src/mappings/utils/orderUtils.ts
@@ -1,5 +1,6 @@
 import { Order, OrderReuse } from '../../@types/schema'
 import { log } from '@graphprotocol/graph-ts'
+import { toChecksumAddress } from 'ethereumjs-util'
 
 export function getOrderId(
   tx: string,
@@ -52,7 +53,10 @@ export function searchOrderForEvent(
     )
     log.info('orderId as trial: {}', [orderId])
     const order = Order.load(orderId)
-    if (order !== null && order.datatoken === address) {
+    if (
+      order !== null &&
+      toChecksumAddress(order.datatoken) === toChecksumAddress(address)
+    ) {
       log.info('order datatoken: {}', [order.datatoken])
       log.info('event address: {}', [address])
       log.info('typeof order datatoken: {}', [typeof order.datatoken])