diff --git a/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h b/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
index 77ea28485..9a39e1578 100755
--- a/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
+++ b/slsReceiverSoftware/include/slsReceiverTCPIPInterface.h
@@ -10,7 +10,8 @@
 
 class MySocketTCP;
 class ServerInterface;
-class slsReceiverImplementation;
+// class slsReceiverImplementation;
+#include "slsReceiverImplementation.h"
 #include "ServerSocket.h"
 
 
@@ -306,7 +307,7 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
 	detectorType myDetectorType;
 
 	/** slsReceiverBase object */
-	slsReceiverImplementation *receiver{nullptr};
+	std::unique_ptr<slsReceiverImplementation> receiver{nullptr};
 
 	/** Function List */
 	int (slsReceiverTCPIPInterface::*flist[NUM_REC_FUNCTIONS])(sls::ServerInterface2& socket);
diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
index 2e3344d2b..076f152b9 100755
--- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
+++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
@@ -583,7 +583,7 @@ int slsReceiverTCPIPInterface::set_detector_type(sls::ServerInterface2 &socket){
 			}
 			if(ret == OK) {
 				if(receiver == nullptr){
-					receiver = new slsReceiverImplementation();
+					receiver = sls::make_unique<slsReceiverImplementation>();
 				}
 				myDetectorType = arg;
 				ret = receiver->setDetectorType(myDetectorType);