diff --git a/core-buffer/src/FastQueue.cpp b/core-buffer/src/FastQueue.cpp
index 5a59b56..69cb2c0 100644
--- a/core-buffer/src/FastQueue.cpp
+++ b/core-buffer/src/FastQueue.cpp
@@ -73,7 +73,7 @@ void FastQueue<T>::commit()
     }
 
     write_slot_id_++;
-    write_slot_id_ %= n_slots_;
+    write_slot_id_ = write_slot_id_ % n_slots_;
 }
 
 template<class T>
@@ -100,7 +100,7 @@ void FastQueue<T>::release()
     }
 
     read_slot_id_++;
-    read_slot_id_ %= n_slots_;
+    read_slot_id_ = read_slot_id_ % n_slots_;
 }
 
 template class FastQueue<ModuleFrame>;