diff --git a/openair3/S1AP/s1ap_common.h b/openair3/S1AP/s1ap_common.h
index a2c380a684d51f478b1c4bf87ebfd2bbddab3ddb..a327e18b02a61fbd0893f2219da33edd99d4f4ed 100644
--- a/openair3/S1AP/s1ap_common.h
+++ b/openair3/S1AP/s1ap_common.h
@@ -333,7 +333,7 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "S1ap-IE.h"
 #include "S1AP-PDU.h"
 
-#if (MAKE_VERSION(9, 0, 0) <= S1AP_VERSION)
+#if (S1AP_VERSION >= MAKE_VERSION(9, 0, 0))
 # include "S1ap-BroadcastCancelledAreaList.h"
 # include "S1ap-CancelledCellinEAI.h"
 # include "S1ap-CancelledCellinEAI-Item.h"
@@ -364,9 +364,9 @@ inline void ASN_DEBUG(const char *fmt, ...);
 # include "S1ap-UplinkUEAssociatedLPPaTransport.h"
 # include "S1ap-DownlinkNonUEAssociatedLPPaTransport.h"
 # include "S1ap-UplinkNonUEAssociatedLPPaTransport.h"
-#endif /* #if (MAKE_VERSION(9, 0, 0) <= S1AP_VERSION) */
+#endif /* #if (S1AP_VERSION >= MAKE_VERSION(9, 0, 0)) */
 
-#if (MAKE_VERSION(10, 0, 0) <= S1AP_VERSION)
+#if (S1AP_VERSION >= MAKE_VERSION(10, 0, 0))
 # include "S1ap-PagingPriority.h"
 # include "S1ap-RelayNode-Indicator.h"
 # include "S1ap-GWContextReleaseIndication.h"
@@ -375,7 +375,7 @@ inline void ASN_DEBUG(const char *fmt, ...);
 # include "S1ap-PrivacyIndicator.h"
 # include "S1ap-TrafficLoadReductionIndication.h"
 # include "S1ap-GUMMEIList.h"
-#endif /* #if (MAKE_VERSION(10, 0, 0) <= S1AP_VERSION) */
+#endif /* #if (S1AP_VERSION >= MAKE_VERSION(10, 0, 0)) */
 
 /* Checking version of ASN1C compiler */
 #if (ASN1C_ENVIRONMENT_VERSION < ASN1C_MINIMUM_VERSION)
diff --git a/openair3/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c
index 44b0a5b1e8d589eeb8b210dc7f74d017b7ed859e..ab5f93a16d8883b7b49f66043f82212837b3607b 100644
--- a/openair3/S1AP/s1ap_eNB_handlers.c
+++ b/openair3/S1AP/s1ap_eNB_handlers.c
@@ -141,7 +141,7 @@ s1ap_message_decoded_callback messages_callback[][3] = {
   { 0, 0, 0 }, /* eNBConfigurationTransfer */
   { 0, 0, 0 }, /* MMEConfigurationTransfer */
   { 0, 0, 0 }, /* CellTrafficTrace */
-#if (MAKE_VERSION(9, 0, 0) <= S1AP_VERSION)
+#if (S1AP_VERSION >= MAKE_VERSION(9, 0, 0))
   { 0, 0, 0 }, /* Kill */
   { 0, 0, 0 }, /* DownlinkUEAssociatedLPPaTransport  */
   { 0, 0, 0 }, /* UplinkUEAssociatedLPPaTransport */