diff --git a/libnfc/drivers/arygon.c b/libnfc/drivers/arygon.c
index 45a5f90..8012966 100644
--- a/libnfc/drivers/arygon.c
+++ b/libnfc/drivers/arygon.c
@@ -284,9 +284,10 @@ arygon_tama_receive (nfc_device_t * pnd, byte_t * pbtData, const size_t szDataLe
 
   switch (CHIP_DATA (pnd)->ui8LastCommand) {
   case InAutoPoll:
-  case TgInitAsTarget:
-  case TgGetData:
+  case InDataExchange:
   case InJumpForDEP:
+  case TgGetData:
+  case TgInitAsTarget:
     abort_fd = DRIVER_DATA (pnd)->iAbortFds[1];
     break;
   default:
diff --git a/libnfc/drivers/pn532_uart.c b/libnfc/drivers/pn532_uart.c
index 0cca5b3..f178202 100644
--- a/libnfc/drivers/pn532_uart.c
+++ b/libnfc/drivers/pn532_uart.c
@@ -271,9 +271,10 @@ pn532_uart_receive (nfc_device_t * pnd, byte_t * pbtData, const size_t szDataLen
 
   switch (CHIP_DATA (pnd)->ui8LastCommand) {
   case InAutoPoll:
+  case InDataExchange:
   case InJumpForDEP:
-  case TgInitAsTarget:
   case TgGetData:
+  case TgInitAsTarget:
     abort_fd = DRIVER_DATA (pnd)->iAbortFds[1];
     break;
   default:
diff --git a/libnfc/drivers/pn53x_usb.c b/libnfc/drivers/pn53x_usb.c
index 612617b..6a1cb85 100644
--- a/libnfc/drivers/pn53x_usb.c
+++ b/libnfc/drivers/pn53x_usb.c
@@ -411,10 +411,10 @@ pn53x_usb_receive (nfc_device_t * pnd, byte_t * pbtData, const size_t szDataLen)
   bool delayed_reply = false;
 
   switch (CHIP_DATA (pnd)->ui8LastCommand) {
+  case InDataExchange:
   case InJumpForDEP:
-  case TgInitAsTarget:
   case TgGetData:
-    DBG ("Delayed reply detected");
+  case TgInitAsTarget:
     delayed_reply = true;
     break;
   default: