diff --git a/armsrc/epa.c b/armsrc/epa.c
index 68b2711da..e97fda7a0 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -108,7 +108,7 @@ int EPA_APDU(uint8_t *apdu, size_t length, uint8_t *response)
 	switch(iso_type)
 	{
 		case 'a':
-			return iso14_apdu(apdu, (uint16_t) length, response, NULL);
+			return iso14_apdu(apdu, (uint16_t) length, false, response, NULL);
 			break;
 		case 'b':
 			return iso14443b_apdu(apdu, length, response);
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index daeb6b749..082d378ac 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2219,14 +2219,14 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX 
 */    
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res) {
 	uint8_t parity[MAX_PARITY_SIZE] = {0x00};
 	uint8_t real_cmd[cmd_len + 4];
 	
 	if (cmd_len) {
 		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
 		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
-		if (param & ISO14A_SEND_CHAINING) {
+		if (send_chaining) {
 			real_cmd[0] |= 0x10;
 		}
 		// put block number into the PCB
@@ -2341,7 +2341,7 @@ void ReaderIso14443a(UsbCommand *c) {
 
 	if ((param & ISO14A_APDU)) {
 		uint8_t res;
-		arg0 = iso14_apdu(cmd, len, buf, &res);
+		arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res);
 		cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
 	}
 
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 7f979e531..a23b5d7c2 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -114,7 +114,7 @@ extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32
 extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
-extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res);
+extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, uint8_t *res);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
 extern int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);
diff --git a/include/mifare.h b/include/mifare.h
index 1373317e7..14c0e7e27 100644
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -35,8 +35,8 @@ typedef enum ISO14A_COMMAND {
 	ISO14A_SET_TIMEOUT =		(1 << 6),
 	ISO14A_NO_SELECT =			(1 << 7),
 	ISO14A_TOPAZMODE =			(1 << 8),
-	ISO14A_NO_RATS =            (1 << 9)
-	ISO14A_SEND_CHAINING =      (1 << 9)
+	ISO14A_NO_RATS =            (1 << 9),
+	ISO14A_SEND_CHAINING =      (1 << 10)
 } iso14a_command_t;
 
 typedef struct {