diff --git a/techlibs/gatemate/cells_sim.v b/techlibs/gatemate/cells_sim.v
index e4b79c31b..810150c59 100644
--- a/techlibs/gatemate/cells_sim.v
+++ b/techlibs/gatemate/cells_sim.v
@@ -1683,8 +1683,8 @@ module CC_FIFO_40K (
 	 end
 
 	always @(*) begin
-		fifo_wraddr = {wr_pointer[tp-1:0], {(15-tp){1'b0}}};
-		fifo_rdaddr = {rd_pointer[tp-1:0], {(15-tp){1'b0}}};
+		fifo_wraddr = wr_pointer[tp-1:0] * B_WIDTH;
+		fifo_rdaddr = rd_pointer[tp-1:0] * A_WIDTH;
 
 		rdaddr = {rd_pointer[tp], rd_pointer_int[tp-1:0]};
 		wraddr = {{(15-tp){1'b0}}, wr_pointer[tp], wr_pointer_int[tp:0]};