diff --git a/.travis.yml b/.travis.yml
index b38f2a0ae..7c7747b9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
   - export ADDRESS_FILE="${HOME}/.ocean/ocean-contracts/artifacts/address.json"
   - export AQUARIUS_URI="http://172.15.0.5:5000"
   - export DEPLOY_CONTRACTS=true
-  - export CONTRACTS_VERSION=v0.5.0
+  - export CONTRACTS_VERSION=v0.5.1
   - bash -x start_ocean.sh --no-dashboard 2>&1 > start_ocean.log &
   - cd ..
   - ./scripts/waitforcontracts.sh
diff --git a/package-lock.json b/package-lock.json
index 33d036ddb..3e6e08927 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -939,9 +939,9 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.5.0.tgz",
-      "integrity": "sha512-6HQVP/Dvbh5b+wdu0rBR78pDwH4I+KeVaK80U5q47R/CvuSin5VpGSii3ZiCLY+O6JRxzjAMzCYo9ugL1cXvbg=="
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.5.1.tgz",
+      "integrity": "sha512-bt5uwh79D759H6O4bAv+ycGdZQISFAxi65cqIygzA9hwsu29+GuOLwu1mxrzl2lVNLs6Emxo7TaDv0jAoyqnCg=="
     },
     "@octokit/auth-token": {
       "version": "2.4.2",
diff --git a/package.json b/package.json
index 4da96d623..ede1a2fae 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@ethereum-navigator/navigator": "^0.5.0",
-    "@oceanprotocol/contracts": "^0.5.0",
+    "@oceanprotocol/contracts": "^0.5.1",
     "decimal.js": "^10.2.0",
     "fs": "0.0.1-security",
     "lzma": "^2.3.2",
diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts
index c66ed3541..65b585e5a 100644
--- a/src/datatokens/Datatokens.ts
+++ b/src/datatokens/Datatokens.ts
@@ -391,22 +391,21 @@ export class DataTokens {
       from: address
     })
     const events = await datatoken.getPastEvents('OrderStarted', {
+      filter: { consumer: address },
       fromBlock: 0,
       toBlock: 'latest'
     })
     for (let i = 0; i < events.length; i++) {
       if (
         String(events[i].returnValues.amount) === this.web3.utils.toWei(String(amount)) &&
-        String(events[i].returnValues.serviceId) === String(serviceId)
+        String(events[i].returnValues.serviceId) === String(serviceId) &&
+        events[i].returnValues.consumer.toLowerCase() === address.toLowerCase()
       ) {
-        const transaction = await this.web3.eth.getTransaction(events[i].transactionHash)
-        if (transaction.from === address) {
-          if (timeout === 0) return events[i].transactionHash
-          const blockDetails = await this.web3.eth.getBlock(events[i].blockHash)
-          const expiry = new BigNumber(blockDetails.timestamp).plus(timeout)
-          const unixTime = new BigNumber(Math.floor(Date.now() / 1000))
-          if (unixTime.isLessThan(expiry)) return events[i].transactionHash
-        }
+        if (timeout === 0) return events[i].transactionHash
+        const blockDetails = await this.web3.eth.getBlock(events[i].blockHash)
+        const expiry = new BigNumber(blockDetails.timestamp).plus(timeout)
+        const unixTime = new BigNumber(Math.floor(Date.now() / 1000))
+        if (unixTime.isLessThan(expiry)) return events[i].transactionHash
       }
     }
     return null
diff --git a/src/utils/ConfigHelper.ts b/src/utils/ConfigHelper.ts
index c69d060c7..f19208a1a 100644
--- a/src/utils/ConfigHelper.ts
+++ b/src/utils/ConfigHelper.ts
@@ -32,13 +32,13 @@ const configs: ConfigHelperConfig[] = [
     chainId: 4,
     network: 'rinkeby',
     nodeUri: 'https://rinkeby.infura.io/v3',
-    factoryAddress: '0xA7a711A09396DF82D9be46A26B48BafdB9BB4fA6',
+    factoryAddress: '0x241D0f315d2bfe32b90282e6863AC22A309EbFa0',
     oceanTokenAddress: '0x8967BCF84170c91B0d24D4302C2376283b0B3a07',
     metadataStoreUri: 'https://aquarius.rinkeby.v3.dev-ocean.com',
     providerUri: 'https://provider.rinkeby.v3.dev-ocean.com',
-    poolFactoryAddress: '0x4658cD157B57E9D0053Bb2d5CbC7B2Aad06dA5E6',
-    fixedRateExchangeAddress: '0x09285F0290D74f01D3287ED9B45d2456956758B4',
-    metadataContractAddress: '0x1da8E04D2ae9b7c32C24e4DB94899b93d8E4751A'
+    poolFactoryAddress: '0xf32E0784F5D127471883aF938c50349A97aF7085',
+    fixedRateExchangeAddress: '0x223B65841d5BAE99c615D0Da7980b2Fc0aFF1dB2',
+    metadataContractAddress: '0x0220D0b4FfCC4A14C7601215aA23da06d5b1c921'
   },
   {
     chainId: 1,