diff --git a/src/components/organisms/AssetActions/Compute/index.tsx b/src/components/organisms/AssetActions/Compute/index.tsx
index 06089e9de..9ced34559 100644
--- a/src/components/organisms/AssetActions/Compute/index.tsx
+++ b/src/components/organisms/AssetActions/Compute/index.tsx
@@ -136,6 +136,7 @@ export default function Compute({
       timeout.toString()
     )
     const assetType = ddo.findServiceByType('metadata').attributes.main.type
+    console.log('checkPreviousOrders  asset ' + assetType + ' id= ', orderId)
     if (assetType === 'algorithm') {
       setPreviousAlgorithmOrderId(orderId)
       setHasPreviousAlgorithmOrder(!!orderId)
@@ -430,7 +431,10 @@ export default function Compute({
 
       Logger.log('[compute] Starting compute job response: ', response)
 
-      setHasPreviousDatasetOrder(true)
+      // setHasPreviousDatasetOrder(true)
+      // setHasPreviousAlgorithmOrder(true)
+      checkPreviousOrders(selectedAlgorithmAsset)
+      checkPreviousOrders(ddo)
       setIsPublished(true)
     } catch (error) {
       setError('Failed to start job!')
diff --git a/src/utils/subgraph.ts b/src/utils/subgraph.ts
index c424251ef..3edd20c82 100644
--- a/src/utils/subgraph.ts
+++ b/src/utils/subgraph.ts
@@ -75,14 +75,18 @@ export async function getPreviousOrders(
     variables
   )
   if (fetchedPreviousOrders.data?.tokenOrders?.length === 0) return null
+  console.log('order fetchedPreviousOrders', fetchedPreviousOrders?.data)
   if (assetTimeout === '0') {
     return fetchedPreviousOrders?.data?.tokenOrders[0]?.tx
   } else {
-    const expiry = new BigNumber(
+    console.log(
+      'order timestamp',
       fetchedPreviousOrders?.data?.tokenOrders[0]?.timestamp
-    ).plus(assetTimeout)
-    const unixTime = new BigNumber(Math.floor(Date.now() / 1000))
-    if (unixTime.isLessThan(expiry)) {
+    )
+    const expiry =
+      fetchedPreviousOrders?.data?.tokenOrders[0]?.timestamp * 1000 +
+      Number(assetTimeout) * 1000
+    if (Date.now() <= expiry) {
       return fetchedPreviousOrders?.data?.tokenOrders[0]?.tx
     } else {
       return null