diff --git a/main.cpp b/main.cpp
index b7430ce..8cc06ed 100644
--- a/main.cpp
+++ b/main.cpp
@@ -78,6 +78,10 @@
         // daemon mode
         else
         {
+            // Handle pending attentions
+            attn::Config attnConfig;
+            attn::attnHandler(&attnConfig);
+
             // assume listener is not running
             bool listenerStarted = false;
             bool newListener     = false;
diff --git a/main_nl.cpp b/main_nl.cpp
index d66e378..88a5a5f 100644
--- a/main_nl.cpp
+++ b/main_nl.cpp
@@ -7,16 +7,6 @@
 #include <attn/attn_main.hpp>
 #include <cli.hpp>
 
-// FIXME TEMP CODE - begin
-
-namespace attn
-{
-int handleCheckstop(Attention* i_attention);
-} // namespace attn
-
-// FIXME TEMP CODE - end
-
-//
 /**
  * @brief Attention handler application main()
  *
@@ -69,7 +59,7 @@
             {
                 attn::Config attnConfig; // default config
 
-                pdbg_targets_init(nullptr); // initialize pdbg targets
+                attn::attnHandler(&attnConfig); // handle pending attentions
 
                 attn::attnDaemon(&attnConfig); // start daemon
             }