diff --git a/core-buffer/include/FastQueue.hpp b/core-buffer/include/FastQueue.hpp
index 4103c55..95c1331 100644
--- a/core-buffer/include/FastQueue.hpp
+++ b/core-buffer/include/FastQueue.hpp
@@ -12,8 +12,8 @@ class FastQueue {
     char* buffer_;
     std::atomic_int* buffer_status_;
 
-    uint16_t write_slot_id_;
-    uint16_t read_slot_id_;
+    std::atomic_uint16_t write_slot_id_;
+    std::atomic_uint16_t read_slot_id_;
 
 public: