diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp
index e15696c..bf8be6f 100644
--- a/core-buffer/include/buffer_config.hpp
+++ b/core-buffer/include/buffer_config.hpp
@@ -60,13 +60,16 @@ namespace core_buffer {
     // How long should the RECV queue be.
     const size_t STREAM_RCVHWM = 100;
 
+    // Size of buffer between the receiving and sending part.
+    const int STREAM_FASTQUEUE_SLOTS = 5;
+
     // Writer RECV queue on ZMQ.
     const int WRITER_RCVHWM = 100;
 
     // ZMQ threads for receiving data from sf_replay.
     const int WRITER_ZMQ_IO_THREADS = 2;
 
-    // Size of buffer between the receiving and writing part of sf_writer
+    // Size of buffer between the receiving and writing part.
     const int WRITER_FASTQUEUE_SLOTS = 5;
 
     // Number of pulses between each statistics print out.
diff --git a/sf-buffer/src/sf_stream.cpp b/sf-buffer/src/sf_stream.cpp
index ddc2d0f..9b71ee8 100644
--- a/sf-buffer/src/sf_stream.cpp
+++ b/sf-buffer/src/sf_stream.cpp
@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
     size_t n_modules = 32;
     FastQueue<ModuleFrameBuffer> queue(
             n_modules * MODULE_N_BYTES,
-            WRITER_RB_BUFFER_SLOTS);
+            STREAM_FASTQUEUE_SLOTS);
 
     auto ctx = zmq_ctx_new();
     zmq_ctx_set (ctx, ZMQ_IO_THREADS, STREAM_ZMQ_IO_THREADS);