diff --git a/Pcie40Libraries/pcie40_b2slc.cpp b/Pcie40Libraries/pcie40_b2slc.cpp
index 5ace66f61e0307098035c52209d7b6d641691dd9..62911bcff4eb962358dd703136dc862f22382a56 100644
--- a/Pcie40Libraries/pcie40_b2slc.cpp
+++ b/Pcie40Libraries/pcie40_b2slc.cpp
@@ -369,7 +369,7 @@ int pcie40_writestream( int dev , int ch , char * filename ) {
     count++ ; 
     data.push_back( (int) ( ( ( 0x70 << 8 ) | ( c & 0xFF ) ) & 0xFFFFFFFF ) ) ;
 
-    if ( 14 == count ) {
+    if ( 6 == count ) {
       data.push_back( 0xEEEE ) ;
       ret = pcie40_writeToFifo( dev , ch , data ) ;
       if ( ret != 0 ) { 
diff --git a/Pcie40Libraries/pcie40_b2slc.h b/Pcie40Libraries/pcie40_b2slc.h
index c79f67e2ae8ece2c13cda0cbd99a8d94cd147eb9..dbdd53e564fd26e7261c33d2c5b8cd835086d589 100644
--- a/Pcie40Libraries/pcie40_b2slc.h
+++ b/Pcie40Libraries/pcie40_b2slc.h
@@ -17,7 +17,9 @@
 #define SLC_RFIFO_ADD 0x00060000
 
 // Functions to read/write registers and stream files to Front End
-extern "C" { 
+#ifndef USE_PCIE40
+extern "C" {
+#endif 
 int pcie40_readfee8(int dev, int ch, int adr);
 
 int pcie40_writefee8(int dev, int ch, int adr, int val);
@@ -29,6 +31,10 @@ int pcie40_writefee32(int dev, int ch, int adr, int val);
 int pcie40_writestream(int dev, int ch, char *filename);
 
 int pcie40_writebytestream(int dev, int ch, int len, const char *bytes);
+
+#ifndef USE_PCIE40
 }
+#endif
+
 #endif // PCIE40_B2SLC_H