diff --git a/core-writer/src/module/H5WriteModule.cpp b/core-writer/src/module/H5WriteModule.cpp
index a78fc9c..cb2e36c 100644
--- a/core-writer/src/module/H5WriteModule.cpp
+++ b/core-writer/src/module/H5WriteModule.cpp
@@ -76,10 +76,7 @@ void H5WriteModule::write_thread(
         const int n_frames,
         const int user_id)
 {
-    // TODO: Take into account file rollover.
-    size_t metadata_buffer_length = n_frames;
-    MetadataBuffer metadata_buffer(metadata_buffer_length, header_values_);
-
+    MetadataBuffer metadata_buffer(n_frames, header_values_);
     BufferedWriter writer(output_file, n_frames, metadata_buffer);
 
     auto raw_frames_dataset_name = config::raw_image_dataset_name;