diff --git a/commercial-paper/organization/digibank/contract-java/src/main/java/org/example/CommercialPaperContract.java b/commercial-paper/organization/digibank/contract-java/src/main/java/org/example/CommercialPaperContract.java
index a75f47e3..a46a7038 100644
--- a/commercial-paper/organization/digibank/contract-java/src/main/java/org/example/CommercialPaperContract.java
+++ b/commercial-paper/organization/digibank/contract-java/src/main/java/org/example/CommercialPaperContract.java
@@ -107,7 +107,7 @@ public class CommercialPaperContract implements ContractInterface {
             String newOwner, int price, String purchaseDateTime) {
 
         // Retrieve the current paper using key fields provided
-        String paperKey = State.makeKey(new String[] { paperNumber });
+        String paperKey = State.makeKey(new String[] { issuer, paperNumber });
         CommercialPaper paper = ctx.paperList.getPaper(paperKey);
 
         // Validate current owner
@@ -146,7 +146,7 @@ public class CommercialPaperContract implements ContractInterface {
     public CommercialPaper redeem(CommercialPaperContext ctx, String issuer, String paperNumber, String redeemingOwner,
             String redeemDateTime) {
 
-        String paperKey = CommercialPaper.makeKey(new String[] { paperNumber });
+        String paperKey = CommercialPaper.makeKey(new String[] { issuer, paperNumber });
 
         CommercialPaper paper = ctx.paperList.getPaper(paperKey);
 
diff --git a/commercial-paper/organization/magnetocorp/contract-java/src/main/java/org/example/CommercialPaperContract.java b/commercial-paper/organization/magnetocorp/contract-java/src/main/java/org/example/CommercialPaperContract.java
index a781c360..a04e62db 100644
--- a/commercial-paper/organization/magnetocorp/contract-java/src/main/java/org/example/CommercialPaperContract.java
+++ b/commercial-paper/organization/magnetocorp/contract-java/src/main/java/org/example/CommercialPaperContract.java
@@ -107,7 +107,7 @@ public class CommercialPaperContract implements ContractInterface {
             String newOwner, int price, String purchaseDateTime) {
 
         // Retrieve the current paper using key fields provided
-        String paperKey = State.makeKey(new String[] { paperNumber });
+        String paperKey = State.makeKey(new String[] { issuer, paperNumber });
         CommercialPaper paper = ctx.paperList.getPaper(paperKey);
 
         // Validate current owner
@@ -146,7 +146,7 @@ public class CommercialPaperContract implements ContractInterface {
     public CommercialPaper redeem(CommercialPaperContext ctx, String issuer, String paperNumber, String redeemingOwner,
             String redeemDateTime) {
 
-        String paperKey = CommercialPaper.makeKey(new String[] { paperNumber });
+        String paperKey = CommercialPaper.makeKey(new String[] {issuer, paperNumber });
 
         CommercialPaper paper = ctx.paperList.getPaper(paperKey);