diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index a6789cda..45a095fb 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1109,15 +1109,15 @@ int CmdHFEMVScan(const char *cmd) {
 	bool paramLoadJSON = arg_get_lit(4);
 
 	enum TransactionType TrType = TT_MSD;
-	if (arg_get_lit(5))
-		TrType = TT_QVSDCMCHIP;
 	if (arg_get_lit(6))
-		TrType = TT_CDA;
+		TrType = TT_QVSDCMCHIP;
 	if (arg_get_lit(7))
+		TrType = TT_CDA;
+	if (arg_get_lit(8))
 		TrType = TT_VSDC;
 
-	bool GenACGPO = arg_get_lit(8);
-	bool MergeJSON = arg_get_lit(9);
+	bool GenACGPO = arg_get_lit(9);
+	bool MergeJSON = arg_get_lit(10);
 	CLIParserFree();
 	
 	SetAPDULogging(showAPDU);
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index b2aa4510..ece7324a 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -38,7 +38,6 @@ enum TransactionType {
 	TT_QVSDCMCHIP,
 	TT_CDA,
 };
-
 extern char *TransactionTypeStr[];
 
 typedef struct {