diff --git a/schema.graphql b/schema.graphql
index f992a32..e450068 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -59,7 +59,7 @@ type Token @entity {
     "block number when it was created"                                   
     block: Int!           
 
-    lastPriceToken: String!
+    lastPriceToken: Token
     lastPriceValue: BigDecimal!
 }
 
@@ -278,7 +278,7 @@ type Order @entity {
   tx: String!
   block: Int!
 
-  lastPriceToken: Token!
+  lastPriceToken: Token
   lastPriceValue: BigDecimal!
   estimatedUSDValue: BigDecimal!
 }
diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index 47e7979..8174af9 100644
--- a/src/mappings/erc20Templates.ts
+++ b/src/mappings/erc20Templates.ts
@@ -69,6 +69,7 @@ export function handleOrderStarted(event: OrderStarted): void {
     order.createdTimestamp
   )
   order.save()
+  log.info('\n\n3 A. order.lastPriceToken: {}\n\n', [order.lastPriceToken])
   token.save()
   addOrder()
   if (token.nft) {