diff --git a/writer/HDF5DataFilePluginJUNGFRAU.cpp b/writer/HDF5DataFilePluginJUNGFRAU.cpp
index 4357ce9e..d6d8263d 100644
--- a/writer/HDF5DataFilePluginJUNGFRAU.cpp
+++ b/writer/HDF5DataFilePluginJUNGFRAU.cpp
@@ -7,18 +7,20 @@ void HDF5DataFilePluginJUNGFRAU::OpenFile(HDF5File &in_data_file, const DataMess
 void HDF5DataFilePluginJUNGFRAU::Write(const DataMessage &msg, uint64_t image_number) {
     if (!msg.jf_info.has_value()
         || !msg.receiver_aq_dev_delay.has_value()
-        || !msg.storage_cell.has_value())
+        || !msg.storage_cell.has_value()
+        || !msg.receiver_free_send_buf.has_value())
         return;
 
     if (image_number >= jf_info.size()) {
         jf_info.resize(image_number + 1);
         storage_cell.resize(image_number + 1);
         receiver_aq_dev_delay.resize(image_number + 1);
+        receiver_free_buffers.resize(image_number + 1);
     }
-
-    receiver_aq_dev_delay[image_number] = msg.receiver_aq_dev_delay.value();
     jf_info[image_number] = msg.jf_info.value();
     storage_cell[image_number]= msg.storage_cell.value();
+    receiver_aq_dev_delay[image_number] = msg.receiver_aq_dev_delay.value();
+    receiver_free_buffers[image_number] = msg.receiver_free_send_buf.value();
 }
 
 void HDF5DataFilePluginJUNGFRAU::WriteFinal(HDF5File &data_file) {
@@ -26,7 +28,8 @@ void HDF5DataFilePluginJUNGFRAU::WriteFinal(HDF5File &data_file) {
         HDF5Group group(data_file, "/entry/jungfrau");
         group.NXClass("NXcollection");
         group.SaveVector("info", jf_info);
-        group.SaveVector("rcv_delay", receiver_aq_dev_delay);
-        group.SaveVector("storage_cell", storage_cell);
+        group.SaveVector("storageCell", storage_cell);
+        group.SaveVector("rcvDelay", receiver_aq_dev_delay);
+        group.SaveVector("rcvFreeSendBuffers", receiver_free_buffers);
     }
 }
diff --git a/writer/HDF5DataFilePluginJUNGFRAU.h b/writer/HDF5DataFilePluginJUNGFRAU.h
index 3439c803..13f9c0bf 100644
--- a/writer/HDF5DataFilePluginJUNGFRAU.h
+++ b/writer/HDF5DataFilePluginJUNGFRAU.h
@@ -9,6 +9,7 @@ class HDF5DataFilePluginJUNGFRAU : public HDF5DataFilePlugin {
     std::vector<uint64_t> jf_info;
     std::vector<uint32_t> storage_cell;
     std::vector<uint64_t> receiver_aq_dev_delay;
+    std::vector<uint64_t> receiver_free_buffers;
 public:
     void OpenFile(HDF5File &data_file, const DataMessage& msg) override;
     void Write(const DataMessage& msg, uint64_t image_number) override;