diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index ec2fa62ebb..e233768610 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -403,7 +403,7 @@ add_boolean_option(ENB_MODE True "Swap the include directories between openair2
 add_boolean_option(ENABLE_PGM_TRANSPORT    False "specific to oaisim, emulation through ethernet, reliable multicast")
 add_boolean_option(ADDR_CONF               False "specific to oaisim, IP autoconf of user-plane IP interface")
 add_boolean_option(OPENAIR_EMU             False "specific to oaisim")
-add_boolean_option(OAI_EMU             False "specific to oaisim")
+add_boolean_option(OAI_EMU                 False "specific to oaisim")
 add_boolean_option(PHY_ABSTRACTION         False "specific to oaisim")
 
 ##########################
@@ -1616,6 +1616,7 @@ target_link_libraries (oai_sgw
 #  )
 #target_link_libraries (nvram ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
 
+
 ###################################"
 # Addexecutables for tests
 ####################################
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index ce5d186368..c2aaea4717 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -337,13 +337,13 @@ function main() {
   if [ "$oaisim" = "1" ] ; then
     dconf=$OPENAIR_DIR/targets/bin
 
-#    echo_info "Compiling at_nas_ue"
-#    mkdir -p $DIR/at_commands/build
-#    cd $DIR/at_commands/build
-#    cmake ..
-#    compilations \
-#      at_commands at_nas_ue \
-#      at_nas_ue $dbin/at_nas_ue
+    echo_info "Compiling at_nas_ue"
+    mkdir -p $DIR/at_commands/build
+    cd $DIR/at_commands/build
+    cmake ..
+    compilations \
+      at_commands at_nas_ue \
+      at_nas_ue $dbin/at_nas_ue
 
     echo_info "Compiling oaisim"
     cmake_file=$DIR/oaisim_build_oai/CMakeLists.txt