diff --git a/java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/command/sam/builder/security/SvCheckCmdBuild.java b/java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/command/sam/builder/security/SvCheckCmdBuild.java
index 42d55a040..f98db6e7c 100644
--- a/java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/command/sam/builder/security/SvCheckCmdBuild.java
+++ b/java/component/keyple-calypso/src/main/java/org/eclipse/keyple/calypso/command/sam/builder/security/SvCheckCmdBuild.java
@@ -40,17 +40,14 @@ public SvCheckCmdBuild(SamRevision revision, byte[] svPoSignature) {
         if (revision != null) {
             this.defaultRevision = revision;
         }
-        byte cla = this.defaultRevision.getClassByte();
-
-        byte p1, p2;
-        byte[] data;
 
-        p1 = (byte) 0x00;
-        p2 = (byte) 0x00;
+        byte cla = this.defaultRevision.getClassByte();
+        byte p1 = (byte) 0x00;
+        byte p2 = (byte) 0x00;
 
         if (svPoSignature != null) {
             // the operation is not "abort"
-            data = new byte[svPoSignature.length];
+            byte[] data = new byte[svPoSignature.length];
             System.arraycopy(svPoSignature, 0, data, 0, svPoSignature.length);
             request = setApduRequest(cla, command, p1, p2, data, null);
         } else {
diff --git a/java/component/keyple-calypso/src/test/java/org/eclipse/keyple/calypso/command/po/parser/security/CloseSessionRespParsTest.java b/java/component/keyple-calypso/src/test/java/org/eclipse/keyple/calypso/command/po/parser/security/CloseSessionRespParsTest.java
index 136a2cc40..7418cdcf4 100644
--- a/java/component/keyple-calypso/src/test/java/org/eclipse/keyple/calypso/command/po/parser/security/CloseSessionRespParsTest.java
+++ b/java/component/keyple-calypso/src/test/java/org/eclipse/keyple/calypso/command/po/parser/security/CloseSessionRespParsTest.java
@@ -108,6 +108,6 @@ public void lc4WithPostponedData() {
         CloseSessionRespPars parser = new CloseSessionRespPars(
                 new ApduResponse(ByteArrayUtil.fromHex("04 345678 FEDCBA98 9000h"), null), null);
         Assert.assertEquals("FEDCBA98", ByteArrayUtil.toHex(parser.getSignatureLo()));
-        Assert.assertEquals("04345678", ByteArrayUtil.toHex(parser.getPostponedData()));
+        Assert.assertEquals("345678", ByteArrayUtil.toHex(parser.getPostponedData()));
     }
 }