diff --git a/srsepc/hdr/mme/nas.h b/srsepc/hdr/mme/nas.h
index cfdbb6d8a..9ac2e7ed5 100644
--- a/srsepc/hdr/mme/nas.h
+++ b/srsepc/hdr/mme/nas.h
@@ -52,7 +52,7 @@ typedef enum {
 } ecm_state_t;
 static const char ecm_state_text[ECM_STATE_N_ITEMS][100] = {"IDLE",
                                                             "CONNECTED"};
-
+/*
 // MME ESM states (3GPP 23.401 v10.0.0, section 4.6.3)
 typedef enum {
   ESM_BEARER_CONTEXT_INACTIVE = 0,
@@ -71,6 +71,14 @@ static const char esm_state_text[ESM_STATE_N_ITEMS][100] = {"CONTEXT INACTIVE",
                                                             "CONTEXT_MODIFY_PENDING",
                                                             "PROCEDURE_TRANSACTION_INACTIVE"
                                                             "PROCEDURE_TRANSACTION_PENDING"};
+*/
+typedef enum
+{
+  ERAB_DEACTIVATED,
+  ERAB_CTX_REQUESTED,
+  ERAB_CTX_SETUP,
+  ERAB_ACTIVE
+} esm_state_t;
 
 /*
  * EMM, ECM, ESM and EPS Security context definition
diff --git a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc
index 41aa28856..5dfe61329 100644
--- a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc
+++ b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc
@@ -317,7 +317,7 @@ s1ap_ctx_mngmt_proc::send_ue_context_release_command(ue_ecm_ctx_t *ecm_ctx, srsl
   ctx_rel_cmd->Cause.choice.nas.e =  LIBLTE_S1AP_CAUSENAS_NORMAL_RELEASE;
 
   LIBLTE_ERROR_ENUM err = liblte_s1ap_pack_s1ap_pdu(&pdu, (LIBLTE_BYTE_MSG_STRUCT*)reply_buffer);
-  if(err != LIBLTE_SUCCESS){
+  if (err != LIBLTE_SUCCESS) {
     m_s1ap_log->error("Could not pack Initial Context Setup Request Message\n");
     return false;
   }