diff --git a/configure b/configure
index 560d4c81e..df1aa8441 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Yambo 5.3.0 r.23878 h.145a6c347e.
+# Generated by GNU Autoconf 2.71 for Yambo 5.3.0 r.23879 h.ffb5b21f0e.
 #
 # Report bugs to <yambo@yambo-code.org>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Yambo'
 PACKAGE_TARNAME='yambo'
-PACKAGE_VERSION='5.3.0 r.23878 h.145a6c347e'
-PACKAGE_STRING='Yambo 5.3.0 r.23878 h.145a6c347e'
+PACKAGE_VERSION='5.3.0 r.23879 h.ffb5b21f0e'
+PACKAGE_STRING='Yambo 5.3.0 r.23879 h.ffb5b21f0e'
 PACKAGE_BUGREPORT='yambo@yambo-code.org'
 PACKAGE_URL=''
 
@@ -1659,7 +1659,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Yambo 5.3.0 r.23878 h.145a6c347e to adapt to many kinds of systems.
+\`configure' configures Yambo 5.3.0 r.23879 h.ffb5b21f0e to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1725,7 +1725,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Yambo 5.3.0 r.23878 h.145a6c347e:";;
+     short | recursive ) echo "Configuration of Yambo 5.3.0 r.23879 h.ffb5b21f0e:";;
    esac
   cat <<\_ACEOF
 
@@ -1967,7 +1967,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Yambo configure 5.3.0 r.23878 h.145a6c347e
+Yambo configure 5.3.0 r.23879 h.ffb5b21f0e
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2596,7 +2596,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Yambo $as_me 5.3.0 r.23878 h.145a6c347e, which was
+It was created by Yambo $as_me 5.3.0 r.23879 h.ffb5b21f0e, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3354,8 +3354,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 SVERSION="5"
 SSUBVERSION="3"
 SPATCHLEVEL="0"
-SREVISION="23878"
-SHASH="145a6c347e"
+SREVISION="23879"
+SHASH="ffb5b21f0e"
 
 
 
@@ -17780,7 +17780,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Yambo $as_me 5.3.0 r.23878 h.145a6c347e, which was
+This file was extended by Yambo $as_me 5.3.0 r.23879 h.ffb5b21f0e, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17844,7 +17844,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Yambo config.status 5.3.0 r.23878 h.145a6c347e
+Yambo config.status 5.3.0 r.23879 h.ffb5b21f0e
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/include/version/version.m4 b/include/version/version.m4
index ba0042726..85025c87f 100644
--- a/include/version/version.m4
+++ b/include/version/version.m4
@@ -1,9 +1,9 @@
-AC_INIT(Yambo, 5.3.0 r.23878 h.145a6c347e, yambo@yambo-code.org)
+AC_INIT(Yambo, 5.3.0 r.23879 h.ffb5b21f0e, yambo@yambo-code.org)
 SVERSION="5"
 SSUBVERSION="3"
 SPATCHLEVEL="0"
-SREVISION="23878"
-SHASH="145a6c347e"
+SREVISION="23879"
+SHASH="ffb5b21f0e"
 AC_SUBST(SVERSION)
 AC_SUBST(SSUBVERSION)
 AC_SUBST(SPATCHLEVEL)
diff --git a/src/stop_and_restart/STOP_now.F b/src/stop_and_restart/STOP_now.F
index f8fbf744f..0ab1b4e40 100644
--- a/src/stop_and_restart/STOP_now.F
+++ b/src/stop_and_restart/STOP_now.F
@@ -19,7 +19,7 @@ logical function STOP_now(DO_IT_NOW)
 #if defined _RT || defined _QED || defined _NL
  use real_time,      ONLY:RT_bands
 #endif
-#if defined NL
+#if defined _NL
  use nl_optics,      ONLY:NL_bands
 #endif
  !