diff --git a/slsReceiverSoftware/include/sls_receiver_defs.h b/slsReceiverSoftware/include/sls_receiver_defs.h
index e37639b07..1d93459df 100755
--- a/slsReceiverSoftware/include/sls_receiver_defs.h
+++ b/slsReceiverSoftware/include/sls_receiver_defs.h
@@ -23,7 +23,7 @@ typedef  int int32_t;
 #define MAX_FRAMES_PER_FILE			20000
 #define SHORT_MAX_FRAMES_PER_FILE	100000
 #define MOENCH_MAX_FRAMES_PER_FILE	1000
-#define EIGER_MAX_FRAMES_PER_FILE	2000
+#define EIGER_MAX_FRAMES_PER_FILE	5
 #define JFRAU_MAX_FRAMES_PER_FILE 	2000
 #define JFCTB_MAX_FRAMES_PER_FILE   100000
 
diff --git a/slsReceiverSoftware/src/UDPStandardImplementation.cpp b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
index 5823220be..082e1dcd1 100644
--- a/slsReceiverSoftware/src/UDPStandardImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPStandardImplementation.cpp
@@ -1572,13 +1572,16 @@ int UDPStandardImplementation::createNewFile(int ithread){
 			frameNumberInPreviousFile[ithread] = -1;
 			cout << "Thread " << ithread << "  File:" << completeFileName[ithread] << endl;
 		}else{
+			if(frameNumberInPreviousFile[ithread] == -1)
+				frameNumberInPreviousFile[ithread] = startFrameIndex - 1;
+
 			cout
 					//<< "Packet Loss:" <<
 					//setw(4)<<fixed << setprecision(4) <<
 					//dec <<	(int)((( (currentFrameNumber-1-previousFrameNumber) - ((packetsInFile-numTotMissingPacketsInFile)/packetsPerFrame))/
 					//		 (double)(currentFrameNumber-1-previousFrameNumber))*100.000)
 					//<< "%\t"
-					<< 		"\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-1-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
+					<< 		"\tPackets Lost:" << dec << ( ((int)(currentFrameNumber[ithread]-frameNumberInPreviousFile[ithread])*packetsPerFrame) -
 								totalPacketsInFile[ithread])
 					<<		"\tCurrentFrameNumber:" << currentFrameNumber[ithread]
 					<< 		"\tPreviousFrameNumber:" << frameNumberInPreviousFile[ithread]
@@ -1593,7 +1596,7 @@ int UDPStandardImplementation::createNewFile(int ithread){
 
 	//reset counters for each new file
 	if(totalWritingPacketCount[ithread]){
-		frameNumberInPreviousFile[ithread] = currentFrameNumber[ithread]-1;
+		frameNumberInPreviousFile[ithread] = currentFrameNumber[ithread];
 		totalPacketsInFile[ithread] = 0;
 	}
 
@@ -2628,6 +2631,8 @@ void UDPStandardImplementation::stopWriting(int ithread, char* wbuffer){
 	}
 
 	if(totalWritingPacketCount[ithread]){
+		if(frameNumberInPreviousFile[ithread]==-1)
+			frameNumberInPreviousFile[ithread] = startFrameIndex - 1;
 		cout << "\nThread " << ithread << "\tFile:" << completeFileName[ithread] <<endl;
 				//<< "Packet Loss:" <<
 				//setw(4)<<fixed << setprecision(4) <<