diff --git a/ch.psi.fda.fdaq/pom.xml b/ch.psi.fda.fdaq/pom.xml
index 634178a..3c7aa40 100644
--- a/ch.psi.fda.fdaq/pom.xml
+++ b/ch.psi.fda.fdaq/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
 	<artifactId>ch.psi.fda.fdaq</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.8</version>
 
 	<dependencies>
 		<dependency>
diff --git a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
index 81394b4..77e69e1 100644
--- a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
+++ b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
@@ -84,8 +84,7 @@ public class FdaqService {
 																		// Integers
 					bytebuffer.order(ByteOrder.LITTLE_ENDIAN);
 					bytebuffer.putInt(26);
-	//				bytebuffer.putInt(numberOfElements);
-					bytebuffer.putInt(16000);
+					bytebuffer.putInt(numberOfElements);
 					out.write(bytebuffer.array());
 					out.flush();
 					
@@ -143,9 +142,6 @@ public class FdaqService {
 					throw new RuntimeException(e);
 				}
 			} finally {
-				
-	//			bus.post(new EndOfStreamMessage());
-				
 				try {
 					out.close();
 					in.close();
@@ -153,8 +149,6 @@ public class FdaqService {
 				} catch (IOException e) {
 					// Ignore because not relevant at this stage
 				}
-				
-				running = false;
 			}
 		
 		}