diff --git a/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java b/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java
index dbb4e3f1..179d1bdf 100644
--- a/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java
+++ b/commercial-paper/organization/digibank/application-java/src/org/papernet/CommercialPaper.java
@@ -18,6 +18,7 @@ public class CommercialPaper extends State {
     public final static String ISSUED = "ISSUED";
     public final static String TRADING = "TRADING";
     public final static String REDEEMED = "REDEEMED";
+    public final static String[] STATES = new String[] {ISSUED, TRADING, REDEEMED};
 
     @Property()
     private String state="";
@@ -161,8 +162,9 @@ public class CommercialPaper extends State {
         String maturityDateTime = json.getString("maturityDateTime");
         String owner = json.getString("owner");
         int faceValue = json.getInt("faceValue");
-        String state = json.getString("state");        
-        return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue,owner,state);
+        int currentState = json.getInt("currentState");
+        String state = STATES[currentState-1];
+        return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state);
     }
 
     public static byte[] serialize(CommercialPaper paper) {
diff --git a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java
index e909b494..e1397e46 100644
--- a/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java
+++ b/commercial-paper/organization/magnetocorp/application-java/src/org/papernet/CommercialPaper.java
@@ -19,6 +19,7 @@ public class CommercialPaper extends State {
     public final static String ISSUED = "ISSUED";
     public final static String TRADING = "TRADING";
     public final static String REDEEMED = "REDEEMED";
+    public final static String[] STATES = new String[] {ISSUED, TRADING, REDEEMED};
 
     @Property()
     private String state="";
@@ -162,7 +163,8 @@ public class CommercialPaper extends State {
         String maturityDateTime = json.getString("maturityDateTime");
         String owner = json.getString("owner");
         int faceValue = json.getInt("faceValue");
-        String state = json.getString("state");
+        int currentState = json.getInt("currentState");
+        String state = STATES[currentState-1];
         return createInstance(issuer, paperNumber, issueDateTime, maturityDateTime, faceValue, owner, state);
     }