diff --git a/vunit/vhdl/data_types/src/queue_pkg-body.vhd b/vunit/vhdl/data_types/src/queue_pkg-body.vhd
index 2559e4b5c..e3b9115f7 100644
--- a/vunit/vhdl/data_types/src/queue_pkg-body.vhd
+++ b/vunit/vhdl/data_types/src/queue_pkg-body.vhd
@@ -44,7 +44,7 @@ package body queue_pkg is
   ) return queue_t is
     constant result : queue_t := new_queue;
   begin
-    for i in 0 to length(queue) - 1 loop
+    for i in get(queue.p_meta, head_idx) to get(queue.p_meta, tail_idx) - 1 loop
       unsafe_push(result, get(queue.data, 1 + i));
     end loop;
     return result;