diff --git a/core-writer/src/ZmqRecvModule.cpp b/core-writer/src/ZmqRecvModule.cpp
index 1c47072..c801553 100644
--- a/core-writer/src/ZmqRecvModule.cpp
+++ b/core-writer/src/ZmqRecvModule.cpp
@@ -63,7 +63,6 @@ void ZmqRecvModule::stop_recv()
 
     for (auto& recv_thread:receiving_threads_) {
         if (recv_thread.joinable()) {
-            cout << "joining first thread" << endl;
             recv_thread.join();
         }
     }
diff --git a/core-writer/src/receiver/ZmqReceiver.cpp b/core-writer/src/receiver/ZmqReceiver.cpp
index c998899..8e98b9a 100644
--- a/core-writer/src/receiver/ZmqReceiver.cpp
+++ b/core-writer/src/receiver/ZmqReceiver.cpp
@@ -106,7 +106,7 @@ void ZmqReceiver::disconnect()
         cout << " Disconnect." << endl;
     #endif
 
-    receiver->disconnect(connect_address);
+    receiver->close();
     context->close();
 }