diff --git a/core-buffer/include/BinaryWriter.hpp b/core-buffer/include/BinaryWriter.hpp
index 16c8411..dbb7d24 100644
--- a/core-buffer/include/BinaryWriter.hpp
+++ b/core-buffer/include/BinaryWriter.hpp
@@ -8,21 +8,24 @@ class BinaryWriter {
 
     const std::string device_name_;
     const std::string root_folder_;
-    const std::string latest_filename_;
+    std::string latest_filename_;
 
     std::string current_output_filename_;
     int output_file_fd_;
 
+    void open_file(const std::string& filename);
+    void close_current_file();
+
 
 public:
     BinaryWriter(
             const std::string& device_name,
             const std::string& root_folder);
 
+    virtual ~BinaryWriter();
+
     void write(const uint64_t pulse_id, const JFFileFormat* buffer);
 
-    void open_file(const std::string& filename);
-    void close_current_file();
 };
 
 
diff --git a/core-buffer/src/BinaryWriter.cpp b/core-buffer/src/BinaryWriter.cpp
index cd86008..e2bca39 100644
--- a/core-buffer/src/BinaryWriter.cpp
+++ b/core-buffer/src/BinaryWriter.cpp
@@ -32,6 +32,11 @@ BinaryWriter::BinaryWriter(
     #endif
 }
 
+BinaryWriter::~BinaryWriter()
+{
+    close_current_file();
+}
+
 void BinaryWriter::write(uint64_t pulse_id, const JFFileFormat* buffer)
 {
     auto current_frame_file =