diff --git a/.run/tmtc listener.run.xml b/.run/tmtc listener.run.xml
index fa4a84a..51ccc6f 100644
--- a/.run/tmtc listener.run.xml	
+++ b/.run/tmtc listener.run.xml	
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-l" />
+    <option name="PARAMETERS" value="tmtc -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/tmtcc.py b/tmtcc.py
index 2b79db5..8b5d4af 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -227,10 +227,13 @@ class TcHandler(TcHandlerBase):
             pus_verificator=pus_verificator,
         )
         self.cfdp_in_ccsds_wrapper = cfdp_in_ccsds_wrapper
-        # self.cfdp_counter = 0
 
     def cfdp_done(self) -> bool:
-        return not self.cfdp_in_ccsds_wrapper.handler.put_request_pending()
+        if self.cfdp_handler_started:
+            if not self.cfdp_in_ccsds_wrapper.handler.put_request_pending():
+                self.cfdp_handler_started = False
+                return True
+        return False
 
     def feed_cb(self, info: ProcedureWrapper, wrapper: FeedWrapper):
         self.queue_helper.queue_wrapper = wrapper.queue_wrapper