diff --git a/src/vsrc/frontend/ftq.sv b/src/vsrc/frontend/ftq.sv
index 8bc0ece..240eb1b 100644
--- a/src/vsrc/frontend/ftq.sv
+++ b/src/vsrc/frontend/ftq.sv
@@ -87,7 +87,7 @@ module ftq
         next_FTQ = FTQ;
         // clear out if committed
         for (integer i = 0; i < COMMIT_WIDTH; i++) begin
-            if (backend_commit_i[i]) next_FTQ[comm_ptr+i] = 0;
+            if (i < backend_commit_num) next_FTQ[comm_ptr+i] = 0;
         end
         // Accept BPU input
         if (bpu_i.valid) next_FTQ[bpu_ptr] = bpu_i;
diff --git a/src/vsrc/instr_buffer.sv b/src/vsrc/instr_buffer.sv
index 3630baf..d5e2f49 100644
--- a/src/vsrc/instr_buffer.sv
+++ b/src/vsrc/instr_buffer.sv
@@ -5,7 +5,7 @@ module instr_buffer
 #(
     parameter IF_WIDTH = 2,
     parameter ID_WIDTH = 2,
-    parameter BUFFER_SIZE = 8
+    parameter BUFFER_SIZE = 16
 ) (
     input logic clk,
     input logic rst,