diff --git a/lib/misc/bbfifo.vhd b/lib/misc/bbfifo.vhd
index a067b93..2152fd8 100644
--- a/lib/misc/bbfifo.vhd
+++ b/lib/misc/bbfifo.vhd
@@ -87,9 +87,7 @@ gen_bb:
 		process (clk)
 		begin
 			if rising_edge(clk) then
-				if rst = '1' then
-					bucket_array(i) <= (others => '0');
-				elsif ce(i) = '1' then
+				if ce(i) = '1' then
 					bucket_array(i) <= bucket_array(i-1);
 				end if;
 			end if;
diff --git a/lib/misc/sim/tb_bbfifo.fdo b/lib/misc/sim/tb_bbfifo.fdo
index 5a23c76..8ec6244 100644
--- a/lib/misc/sim/tb_bbfifo.fdo
+++ b/lib/misc/sim/tb_bbfifo.fdo
@@ -11,4 +11,4 @@ do {tb_bbfifo.wdo}
 view wave
 view structure
 view signals
-run 1us
+run 500 ns
diff --git a/lib/misc/sim/tb_bbfifo.wdo b/lib/misc/sim/tb_bbfifo.wdo
index b97cf38..86a72ea 100644
--- a/lib/misc/sim/tb_bbfifo.wdo
+++ b/lib/misc/sim/tb_bbfifo.wdo
@@ -5,15 +5,16 @@ add wave -noupdate -format Logic /tb_bbfifo/clk
 add wave -noupdate -format Logic /tb_bbfifo/re
 add wave -noupdate -format Logic /tb_bbfifo/we
 add wave -noupdate -format Logic /tb_bbfifo/ready
-add wave -noupdate -format Logic /tb_bbfifo/avail
 add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/din
+add wave -noupdate -format Logic /tb_bbfifo/avail
 add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/inst_bbfifo/bucket_array
-add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/q
-add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/ce
 add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/dout_reg
+add wave -noupdate -divider BB-FIFO
+add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/ce
+add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/q
+add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/inst_bbfifo/bucket_array
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {49969 ps} 0}
+WaveRestoreCursors {{Cursor 1} {70000 ps} 0}
 configure wave -namecolwidth 150
 configure wave -valuecolwidth 100
 configure wave -justifyvalue left
@@ -27,4 +28,4 @@ configure wave -gridperiod 1
 configure wave -griddelta 40
 configure wave -timeline 0
 update
-WaveRestoreZoom {0 ps} {1050 ns}
+WaveRestoreZoom {0 ps} {525 ns}