diff --git a/core-buffer/include/BufferUtils.hpp b/core-buffer/include/BufferUtils.hpp
index 455da6b..fb8063a 100644
--- a/core-buffer/include/BufferUtils.hpp
+++ b/core-buffer/include/BufferUtils.hpp
@@ -29,7 +29,7 @@ namespace BufferUtils
         std::string path;
     };
 
-    std::vector<path_sufix> BufferUtils::get_path_suffixes(
+    std::vector<path_sufix> get_path_suffixes(
             const uint64_t start_pulse_id,
             const uint64_t stop_pulse_id);
 }
diff --git a/core-buffer/src/BufferUtils.cpp b/core-buffer/src/BufferUtils.cpp
index ccfa5be..e70c530 100644
--- a/core-buffer/src/BufferUtils.cpp
+++ b/core-buffer/src/BufferUtils.cpp
@@ -91,7 +91,9 @@ vector<BufferUtils::path_sufix> BufferUtils::get_path_suffixes (
 
         result.emplace_back<BufferUtils::path_sufix>(
                 {first_pulse_id,
-                 first_pulse_id+FILE_MOD+1,
+                 first_pulse_id+FILE_MOD-1,
                  folder.str()});
     }
+
+    return result;
 }
\ No newline at end of file
diff --git a/core-buffer/test/test_buffer_utils.cpp b/core-buffer/test/test_buffer_utils.cpp
index 53182a4..3b23b6e 100644
--- a/core-buffer/test/test_buffer_utils.cpp
+++ b/core-buffer/test/test_buffer_utils.cpp
@@ -45,4 +45,20 @@ TEST(BufferUtils, get_file_frame_index)
     ASSERT_EQ(BufferUtils::get_file_frame_index(12345000), 0);
     ASSERT_EQ(BufferUtils::get_file_frame_index(12345543), 543);
     ASSERT_EQ(BufferUtils::get_file_frame_index(12345999), 999);
+}
+
+TEST(BufferUtils, get_path_suffixes)
+{
+    auto suffixes = BufferUtils::get_path_suffixes(15100, 17500);
+    ASSERT_EQ(suffixes[0].start_pulse_id, 15000);
+    ASSERT_EQ(suffixes[0].stop_pulse_id, 15999);
+    ASSERT_EQ(suffixes[0].path, "0/15000.h5");
+
+    ASSERT_EQ(suffixes[1].start_pulse_id, 16000);
+    ASSERT_EQ(suffixes[1].stop_pulse_id, 16999);
+    ASSERT_EQ(suffixes[1].path, "0/16000.h5");
+
+    ASSERT_EQ(suffixes[2].start_pulse_id, 17000);
+    ASSERT_EQ(suffixes[2].stop_pulse_id, 17999);
+    ASSERT_EQ(suffixes[2].path, "0/17000.h5");
 }
\ No newline at end of file