diff --git a/lib/sbi/message.c b/lib/sbi/message.c
index d3f408e62..a807a8a01 100644
--- a/lib/sbi/message.c
+++ b/lib/sbi/message.c
@@ -1207,7 +1207,7 @@ int ogs_sbi_parse_request(
 
             token = ogs_strtok_r(v, ",", &saveptr);
             while (token != NULL) {
-                if (message->param.num_of_fields <
+                if (message->param.num_of_dataset_names <
                         OGS_SBI_MAX_NUM_OF_DATASETNAMES) {
                     message->param.dataset_names
                         [message->param.num_of_dataset_names] =
diff --git a/src/udr/nudr-handler.c b/src/udr/nudr-handler.c
index 6e26f810f..b37239022 100644
--- a/src/udr/nudr-handler.c
+++ b/src/udr/nudr-handler.c
@@ -804,7 +804,7 @@ bool udr_nudr_dr_handle_subscription_provisioned(
 
             singleNSSAI = ogs_calloc(1, sizeof(*singleNSSAI));
             ogs_assert(singleNSSAI);
-            
+
             dnnConfigurationList = ogs_calloc(1, sizeof(*dnnConfigurationList));
             ogs_assert(dnnConfigurationList);
 
@@ -1016,7 +1016,7 @@ bool udr_nudr_dr_handle_subscription_provisioned(
         }
 
         memset(&smSubsData, 0, sizeof(smSubsData));
-        smSubsData.session_management_subscription_data_list = 
+        smSubsData.session_management_subscription_data_list =
             SessionManagementSubscriptionDataList;
 
         if (!returnProvisionedData) {