diff --git a/slsReceiverSoftware/include/DataStreamer.h b/slsReceiverSoftware/include/DataStreamer.h
index d939f203b..fe009502f 100644
--- a/slsReceiverSoftware/include/DataStreamer.h
+++ b/slsReceiverSoftware/include/DataStreamer.h
@@ -206,7 +206,7 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
 	uint64_t firstMeasurementIndex;
 
 	/* File name to stream */
-	char fileNametoStream[MAX_STR_LENGTH];
+	std::string fileNametoStream;
 
 	/** Complete buffer used for roi, eg. shortGotthard */
 	char* completeBuffer;
diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/slsReceiverSoftware/include/ZmqSocket.h
index 5b569f94a..f06fe1753 100644
--- a/slsReceiverSoftware/include/ZmqSocket.h
+++ b/slsReceiverSoftware/include/ZmqSocket.h
@@ -245,7 +245,7 @@ public:
 	 */
 	int SendHeaderData ( int index, bool dummy, uint32_t jsonversion, uint32_t dynamicrange = 0, uint64_t fileIndex = 0,
 			uint32_t npixelsx = 0, uint32_t npixelsy = 0, uint32_t imageSize = 0,
-			uint64_t acqIndex = 0, uint64_t fIndex = 0, char* fname = NULL,
+			uint64_t acqIndex = 0, uint64_t fIndex = 0, std::string fname = "",
 			uint64_t frameNumber = 0, uint32_t expLength = 0, uint32_t packetNumber = 0,
 			uint64_t bunchId = 0, uint64_t timestamp = 0,
 			uint16_t modId = 0, uint16_t row = 0, uint16_t column = 0, uint16_t reserved = 0,
@@ -288,7 +288,7 @@ public:
 				;//"}\n";
 		sprintf(buf, jsonHeaderFormat,
 				jsonversion, dynamicrange, fileIndex, npixelsx, npixelsy, imageSize,
-				acqIndex, fIndex, (fname == NULL)? "":fname, dummy?0:1,
+				acqIndex, fIndex, fname.c_str(), dummy?0:1,
 
 				        frameNumber, expLength, packetNumber, bunchId, timestamp,
 						modId, row, column, reserved, debug, roundRNumber,
diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp
index fee9fca24..cdafc9e76 100644
--- a/slsReceiverSoftware/src/DataStreamer.cpp
+++ b/slsReceiverSoftware/src/DataStreamer.cpp
@@ -40,7 +40,6 @@ DataStreamer::DataStreamer(int ind, Fifo*& f, uint32_t* dr, std::vector<ROI>* r,
 
     FILE_LOG(logDEBUG) << "DataStreamer " << ind << " created";
 
-	memset(fileNametoStream, 0, MAX_STR_LENGTH);
 }
 
 
@@ -83,7 +82,7 @@ void DataStreamer::ResetParametersforNewMeasurement(char* fname){
     runningFlag = false;
 	firstMeasurementIndex = 0;
 	measurementStartedFlag = false;
-	strcpy(fileNametoStream, fname);
+	fileNametoStream.assign(fname);
 	if (completeBuffer) {
 		delete [] completeBuffer;
 		completeBuffer = 0;