diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index c3ec440..cbb6cda 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -418,12 +418,13 @@
 	var uint32_t dl_fn;
 
 	f_rx_rlcmac_dl_block(dl_block, dl_fn);
-	if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK(ul_tfi := ?, tlli := ?))) {
-		setverdict(fail, "Failed to match Packet Uplink ACK / NACK");
-		f_shutdown(__BFILE__, __LINE__);
+	if (match(dl_block, tr_RLCMAC_UL_ACK_NACK_GPRS(ul_tfi := ?)) or
+	    match(dl_block, tr_RLCMAC_UL_ACK_NACK_EGPRS(ul_tfi := ?))) {
+		poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);
+		return;
 	}
-
-	poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);
+	setverdict(fail, "Failed to match Packet Uplink ACK / NACK:", dl_block);
+	f_shutdown(__BFILE__, __LINE__);
 }
 
 function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block)