diff --git a/src/fetcher.cc b/src/fetcher.cc
index f20ae44..eb40f83 100644
--- a/src/fetcher.cc
+++ b/src/fetcher.cc
@@ -193,7 +193,9 @@
         }
 
       // tell FetchManager that we have finish our job
-      m_onFetchComplete (*this);
+      // m_onFetchComplete (*this);
+      // using executor, so we won't be deleted if there is scheduled FillPipeline call
+      m_executor->execute (bind (m_onFetchComplete, *this));
     }
   else
     {