diff --git a/src/smf/context.h b/src/smf/context.h
index 418f6b03c..413a10d84 100644
--- a/src/smf/context.h
+++ b/src/smf/context.h
@@ -305,7 +305,7 @@ typedef struct smf_sess_s {
     /* Handover */
     struct {
         bool prepared;
-        bool direct_available;
+        bool data_forwarding_not_possible;
         bool indirect_data_forwarding;
 
         /* NG-U UP Transport Information Saved Temporally */
diff --git a/src/smf/ngap-build.c b/src/smf/ngap-build.c
index 451a4735f..88d0c8774 100644
--- a/src/smf/ngap-build.c
+++ b/src/smf/ngap-build.c
@@ -87,7 +87,7 @@ ogs_pkbuf_t *ngap_build_pdu_session_resource_setup_request_transfer(
     ogs_asn_ip_to_BIT_STRING(&upf_n3_ip, &gTPTunnel->transportLayerAddress);
     ogs_asn_uint32_to_OCTET_STRING(sess->upf_n3_teid, &gTPTunnel->gTP_TEID);
 
-    if (sess->handover.direct_available == false) {
+    if (sess->handover.data_forwarding_not_possible == true) {
         ie = CALLOC(1,
                 sizeof(NGAP_PDUSessionResourceSetupRequestTransferIEs_t));
         ogs_assert(ie);
diff --git a/src/smf/ngap-handler.c b/src/smf/ngap-handler.c
index 6cc737a60..a993820a7 100644
--- a/src/smf/ngap-handler.c
+++ b/src/smf/ngap-handler.c
@@ -392,11 +392,8 @@ int ngap_handle_handover_required_transfer(
     }
 
     directForwardingPathAvailability = message.directForwardingPathAvailability;
-    if (directForwardingPathAvailability) {
-        sess->handover.direct_available = true;
-    } else {
-        sess->handover.direct_available = false;
-    }
+    if (!directForwardingPathAvailability)
+        sess->handover.data_forwarding_not_possible = true;
 
     n2smbuf = ngap_build_pdu_session_resource_setup_request_transfer(sess);
     ogs_assert(n2smbuf);