diff --git a/lib/src/main/java/im/status/keycard/applet/BIP32KeyPair.java b/lib/src/main/java/im/status/keycard/applet/BIP32KeyPair.java
index 39048dd..8c612d9 100644
--- a/lib/src/main/java/im/status/keycard/applet/BIP32KeyPair.java
+++ b/lib/src/main/java/im/status/keycard/applet/BIP32KeyPair.java
@@ -66,13 +66,13 @@ public class BIP32KeyPair {
       tlv.unreadLastTag();
       privKey = tlv.readPrimitive(TLV_PRIV_KEY);
       tag = tlv.readTag();
-
-      if (tag == TLV_CHAIN_CODE) {
-        tlv.unreadLastTag();
-        chainCode = tlv.readPrimitive(TLV_CHAIN_CODE);
-      }
     }
 
+    if (tag == TLV_CHAIN_CODE) {
+      tlv.unreadLastTag();
+      chainCode = tlv.readPrimitive(TLV_CHAIN_CODE);
+    }    
+
     return new BIP32KeyPair(privKey, chainCode, pubKey);
   }