diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 477062d38..e2988e1e7 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1283,7 +1283,7 @@ int CmdEMVExec(const char *cmd) {
 		
 
 		// needs to send AC2 command (res == ARQC)
-		if ((CID & 0xc0) == 0x80) {
+		if ((CID & EMVAC_AC_MASK) == EMVAC_ARQC) {
 			PrintAndLogEx(NORMAL, "\n* * Calc CDOL2");
 			struct tlv *cdol2_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8d, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
 			if (!cdol2_data_tlv) {
diff --git a/client/emv/emvcore.h b/client/emv/emvcore.h
index 7d53e83bb..9aaaf2e6f 100644
--- a/client/emv/emvcore.h
+++ b/client/emv/emvcore.h
@@ -39,7 +39,7 @@ typedef enum {
 
 enum TransactionType {
 	TT_MSD,
-	TT_VSDC,        // not standart for contactless!!!!
+	TT_VSDC,        // contact only. not standart for contactless
 	TT_QVSDCMCHIP,
 	TT_CDA,
 };