diff --git a/rtl/ibex_tracer.sv b/rtl/ibex_tracer.sv
index b07b742c50..1540f61a55 100644
--- a/rtl/ibex_tracer.sv
+++ b/rtl/ibex_tracer.sv
@@ -81,7 +81,7 @@ module ibex_tracer (
 
   import ibex_tracer_pkg::*;
 
-  int          file_handle;
+  int          xfile_handle;
   string       file_name;
 
   int unsigned cycle;
@@ -110,6 +110,8 @@ module ibex_tracer (
   function automatic void printbuffer_dumpline();
     string rvfi_insn_str;
 
+    int    file_handle = xfile_handle;
+
     if (file_handle == 32'h0) begin
       string file_name_base = "trace_core";
       void'($value$plusargs("ibex_tracer_file_base=%s", file_name_base));
@@ -119,6 +121,8 @@ module ibex_tracer (
       file_handle = $fopen(file_name, "w");
       $fwrite(file_handle,
               "Time\tCycle\tPC\tInsn\tDecoded instruction\tRegister and memory contents\n");
+
+      xfile_handle <= file_handle;
     end
 
     // Write compressed instructions as four hex digits (16 bit word), and
@@ -746,8 +750,8 @@ module ibex_tracer (
 
   // close output file for writing
   final begin
-    if (file_handle != 32'h0) begin
-      $fclose(file_handle);
+    if (xfile_handle != 32'h0) begin
+      $fclose(xfile_handle);
     end
   end
 
@@ -759,8 +763,14 @@ module ibex_tracer (
   end
 
   always_comb begin
+    /* verilator lint_off MULTIDRIVEN */
+    // Actually, the signals "decoded_str" and "data_accessed" are not being MULTIDRIVEN,
+    // They are only assigned in one always_comb block.
+    // However, Verilator does not seem to be able to detect this.
+    // Corresponding issue: https://github.com/verilator/verilator/issues/4045
     decoded_str = "";
     data_accessed = 5'h0;
+    /* verilator lint_on MULTIDRIVEN */
     insn_is_compressed = 0;
 
     // Check for compressed instructions