diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index b41d7eb..207adcd 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -1096,9 +1096,15 @@
 #endif
 #ifdef RAN_EMULATION_RANAP
 	case (RAN_PROTOCOL_RANAP) {
+		var template (omit) RANAP_IEs.SAPI sapi := omit;
 		var RANAP_PDU ranap;
-		/* FIXME: convert DLCI into SAPI */
-		ranap := valueof(ts_RANAP_DirectTransfer(l3_enc));
+
+		/* Perform DLCI -> SAPI transformation (x & 0x07) */
+		if (dlci and4b '07'O == '03'O) {
+			sapi := sapi_3;
+		}
+
+		ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi := sapi));
 		RANAP.send(ts_RANAP_DATA_req(sccp_conn_id, ranap));
 		}
 #endif