diff --git a/lsu_bus_buffer.fir b/lsu_bus_buffer.fir
index 63e59658..9c21b6e3 100644
--- a/lsu_bus_buffer.fir
+++ b/lsu_bus_buffer.fir
@@ -2513,8 +2513,8 @@ circuit lsu_bus_buffer :
     node _T_1769 = and(_T_1768, io.ldst_dual_r) @[lsu_bus_buffer.scala 345:35]
     node _T_1770 = or(_T_1767, _T_1769) @[lsu_bus_buffer.scala 344:250]
     obuf_merge_en <= _T_1770 @[lsu_bus_buffer.scala 342:17]
-    reg obuf_wr_enQ : UInt<1>, clock with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:18]
-    obuf_wr_enQ <= obuf_wr_en @[lib.scala 377:18]
+    reg obuf_wr_enQ : UInt<1>, io.lsu_busm_clk with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:33]
+    obuf_wr_enQ <= obuf_wr_en @[lib.scala 377:33]
     node _T_1771 = mux(obuf_wr_en, UInt<1>("h01"), obuf_valid) @[lsu_bus_buffer.scala 348:58]
     node _T_1772 = eq(obuf_rst, UInt<1>("h00")) @[lsu_bus_buffer.scala 348:93]
     node _T_1773 = and(_T_1771, _T_1772) @[lsu_bus_buffer.scala 348:91]
@@ -2531,14 +2531,14 @@ circuit lsu_bus_buffer :
       _T_1776 <= obuf_rdrsp_pend_in @[Reg.scala 28:23]
       skip @[Reg.scala 28:19]
     obuf_rdrsp_pend <= _T_1776 @[lsu_bus_buffer.scala 350:19]
-    reg _T_1777 : UInt<1>, clock with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:18]
-    _T_1777 <= obuf_cmd_done_in @[lib.scala 377:18]
+    reg _T_1777 : UInt<1>, io.lsu_busm_clk with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:33]
+    _T_1777 <= obuf_cmd_done_in @[lib.scala 377:33]
     obuf_cmd_done <= _T_1777 @[lsu_bus_buffer.scala 351:17]
-    reg _T_1778 : UInt<1>, clock with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:18]
-    _T_1778 <= obuf_data_done_in @[lib.scala 377:18]
+    reg _T_1778 : UInt<1>, io.lsu_busm_clk with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:33]
+    _T_1778 <= obuf_data_done_in @[lib.scala 377:33]
     obuf_data_done <= _T_1778 @[lsu_bus_buffer.scala 352:18]
-    reg _T_1779 : UInt, clock with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:18]
-    _T_1779 <= obuf_rdrsp_tag_in @[lib.scala 377:18]
+    reg _T_1779 : UInt, io.lsu_busm_clk with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:33]
+    _T_1779 <= obuf_rdrsp_tag_in @[lib.scala 377:33]
     obuf_rdrsp_tag <= _T_1779 @[lsu_bus_buffer.scala 353:18]
     reg _T_1780 : UInt, clock with : (reset => (reset, UInt<1>("h00"))) @[Reg.scala 27:20]
     when obuf_wr_en : @[Reg.scala 28:19]
@@ -2588,8 +2588,8 @@ circuit lsu_bus_buffer :
     rvclkhdr_3.io.scan_mode <= UInt<1>("h00") @[lib.scala 394:24]
     reg obuf_data : UInt, rvclkhdr_3.io.l1clk with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 396:16]
     obuf_data <= obuf_data_in @[lib.scala 396:16]
-    reg _T_1784 : UInt<1>, clock with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:18]
-    _T_1784 <= obuf_data_done_in @[lib.scala 377:18]
+    reg _T_1784 : UInt<1>, io.lsu_busm_clk with : (reset => (reset, UInt<1>("h00"))) @[lib.scala 377:33]
+    _T_1784 <= obuf_data_done_in @[lib.scala 377:33]
     obuf_wr_timer <= _T_1784 @[lsu_bus_buffer.scala 363:17]
     wire WrPtr0_m : UInt<2>
     WrPtr0_m <= UInt<1>("h00")
diff --git a/lsu_bus_buffer.v b/lsu_bus_buffer.v
index bc9d1b87..91f25979 100644
--- a/lsu_bus_buffer.v
+++ b/lsu_bus_buffer.v
@@ -371,7 +371,7 @@ module lsu_bus_buffer(
   wire  _T_4131 = _T_4128 | _T_4130; // @[lsu_bus_buffer.scala 459:77]
   reg  obuf_valid; // @[lsu_bus_buffer.scala 348:54]
   wire  _T_4132 = _T_4131 & obuf_valid; // @[lsu_bus_buffer.scala 459:135]
-  reg  obuf_wr_enQ; // @[lib.scala 377:18]
+  reg  obuf_wr_enQ; // @[lib.scala 377:33]
   wire  _T_4133 = _T_4132 & obuf_wr_enQ; // @[lsu_bus_buffer.scala 459:148]
   wire  _T_4155 = 3'h3 == buf_state_3; // @[Conditional.scala 37:30]
   wire  _T_4239 = 3'h4 == buf_state_3; // @[Conditional.scala 37:30]
@@ -1053,7 +1053,7 @@ module lsu_bus_buffer(
   wire [3:0] buf_numvld_cmd_any = _T_4449 + _GEN_370; // @[lsu_bus_buffer.scala 530:126]
   wire  _T_1017 = buf_numvld_cmd_any == 4'h1; // @[lsu_bus_buffer.scala 266:72]
   wire  _T_1018 = _T_1016 & _T_1017; // @[lsu_bus_buffer.scala 266:51]
-  reg  _T_1784; // @[lib.scala 377:18]
+  reg  _T_1784; // @[lib.scala 377:33]
   wire [2:0] obuf_wr_timer = {{2'd0}, _T_1784}; // @[lsu_bus_buffer.scala 363:17]
   wire  _T_1019 = obuf_wr_timer != 3'h7; // @[lsu_bus_buffer.scala 266:97]
   wire  _T_1020 = _T_1018 & _T_1019; // @[lsu_bus_buffer.scala 266:80]
@@ -1275,8 +1275,8 @@ module lsu_bus_buffer(
   wire  _T_1229 = _T_1148 & _T_1228; // @[lsu_bus_buffer.scala 289:164]
   wire  _T_1230 = _T_1094 | _T_1229; // @[lsu_bus_buffer.scala 287:98]
   reg  obuf_write; // @[Reg.scala 27:20]
-  reg  obuf_cmd_done; // @[lib.scala 377:18]
-  reg  obuf_data_done; // @[lib.scala 377:18]
+  reg  obuf_cmd_done; // @[lib.scala 377:33]
+  reg  obuf_data_done; // @[lib.scala 377:33]
   wire  _T_4814 = obuf_cmd_done | obuf_data_done; // @[lsu_bus_buffer.scala 563:54]
   wire  _T_4815 = obuf_cmd_done ? io_lsu_axi_w_ready : io_lsu_axi_aw_ready; // @[lsu_bus_buffer.scala 563:75]
   wire  _T_4816 = io_lsu_axi_aw_ready & io_lsu_axi_w_ready; // @[lsu_bus_buffer.scala 563:153]
@@ -1399,7 +1399,7 @@ module lsu_bus_buffer(
   wire  _T_1348 = obuf_valid & _T_1347; // @[lsu_bus_buffer.scala 327:18]
   reg  obuf_rdrsp_pend; // @[Reg.scala 27:20]
   wire  bus_rsp_read = io_lsu_axi_r_valid & io_lsu_axi_r_ready; // @[lsu_bus_buffer.scala 567:38]
-  reg [2:0] obuf_rdrsp_tag; // @[lib.scala 377:18]
+  reg [2:0] obuf_rdrsp_tag; // @[lib.scala 377:33]
   wire  _T_1349 = io_lsu_axi_r_bits_id == obuf_rdrsp_tag; // @[lsu_bus_buffer.scala 327:90]
   wire  _T_1350 = bus_rsp_read & _T_1349; // @[lsu_bus_buffer.scala 327:70]
   wire  _T_1351 = ~_T_1350; // @[lsu_bus_buffer.scala 327:55]
@@ -3779,7 +3779,7 @@ end // initial
       obuf_valid <= _T_1771 & _T_1772;
     end
   end
-  always @(posedge clock or posedge reset) begin
+  always @(posedge io_lsu_busm_clk or posedge reset) begin
     if (reset) begin
       obuf_wr_enQ <= 1'h0;
     end else begin
@@ -4079,7 +4079,7 @@ end // initial
       ibuf_sz <= ibuf_sz_in;
     end
   end
-  always @(posedge clock or posedge reset) begin
+  always @(posedge io_lsu_busm_clk or posedge reset) begin
     if (reset) begin
       _T_1784 <= 1'h0;
     end else begin
@@ -4220,14 +4220,14 @@ end // initial
       end
     end
   end
-  always @(posedge clock or posedge reset) begin
+  always @(posedge io_lsu_busm_clk or posedge reset) begin
     if (reset) begin
       obuf_cmd_done <= 1'h0;
     end else begin
       obuf_cmd_done <= _T_1303 & _T_4821;
     end
   end
-  always @(posedge clock or posedge reset) begin
+  always @(posedge io_lsu_busm_clk or posedge reset) begin
     if (reset) begin
       obuf_data_done <= 1'h0;
     end else begin
@@ -4301,7 +4301,7 @@ end // initial
       obuf_rdrsp_pend <= obuf_rdrsp_pend_in;
     end
   end
-  always @(posedge clock or posedge reset) begin
+  always @(posedge io_lsu_busm_clk or posedge reset) begin
     if (reset) begin
       obuf_rdrsp_tag <= 3'h0;
     end else if (_T_1330) begin
diff --git a/src/main/scala/lib/lib.scala b/src/main/scala/lib/lib.scala
index 1c815f0f..c1754997 100644
--- a/src/main/scala/lib/lib.scala
+++ b/src/main/scala/lib/lib.scala
@@ -374,7 +374,7 @@ trait lib extends param{
   def apply(din: UInt, clk: Clock, clken: Bool,rawclk:Clock):UInt = {
     if (RV_FPGA_OPTIMIZE)
     withClock (clk) {RegEnable (din, 0.U, clken)}
-    else RegNext (din, 0.U)
+    else withClock(clk){RegNext (din, 0.U)}
   }
 }
   object rvdffs_fpga {
diff --git a/target/scala-2.12/classes/lib/lib$rvdff_fpga$.class b/target/scala-2.12/classes/lib/lib$rvdff_fpga$.class
index b5e63363..0478df24 100644
Binary files a/target/scala-2.12/classes/lib/lib$rvdff_fpga$.class and b/target/scala-2.12/classes/lib/lib$rvdff_fpga$.class differ
diff --git a/target/scala-2.12/classes/lib/lib$rvdffe$.class b/target/scala-2.12/classes/lib/lib$rvdffe$.class
index 5e9972dd..561c97b9 100644
Binary files a/target/scala-2.12/classes/lib/lib$rvdffe$.class and b/target/scala-2.12/classes/lib/lib$rvdffe$.class differ
diff --git a/target/scala-2.12/classes/lib/lib$rvdffs_fpga$.class b/target/scala-2.12/classes/lib/lib$rvdffs_fpga$.class
index 0de59f58..d4ca4aee 100644
Binary files a/target/scala-2.12/classes/lib/lib$rvdffs_fpga$.class and b/target/scala-2.12/classes/lib/lib$rvdffs_fpga$.class differ
diff --git a/target/scala-2.12/classes/lsu/lsu_bus_buffer.class b/target/scala-2.12/classes/lsu/lsu_bus_buffer.class
index b40603b4..1e92abf1 100644
Binary files a/target/scala-2.12/classes/lsu/lsu_bus_buffer.class and b/target/scala-2.12/classes/lsu/lsu_bus_buffer.class differ