diff --git a/lib/system/stacktraces.nim b/lib/system/stacktraces.nim
index 7c8ab83c48445..cdb24eaedf253 100644
--- a/lib/system/stacktraces.nim
+++ b/lib/system/stacktraces.nim
@@ -29,6 +29,8 @@ when defined(nimStackTraceOverride):
       proc (programCounters: seq[cuintptr_t], maxLength: cint): seq[StackTraceEntry] {.
         nimcall, gcsafe, raises: [], tags: [], noinline.}
 
+
+
   # Default procedures (not normally used, because people opting in on this
   # override are supposed to register their own versions).
   var
@@ -65,6 +67,15 @@ when defined(nimStackTraceOverride):
     for i in 0..<programCounters.len:
       s.add(StackTraceEntry(programCounter: cast[uint](programCounters[i])))
 
+  proc patchStackTraceEntry(x: var StackTraceEntry) =
+    x.procname = x.procnameStr.cstring
+    x.filename = x.filenameStr.cstring
+
+  proc addStackTraceEntrySeq(result: var seq[StackTraceEntry]; s: seq[StackTraceEntry]) =
+    for i in 0..<s.len:
+      result.add(s[i])
+      patchStackTraceEntry(result[result.high])
+
   # We may have more stack trace lines in the output, due to inlined procedures.
   proc addDebuggingInfo*(s: seq[StackTraceEntry]): seq[StackTraceEntry] =
     var programCounters: seq[cuintptr_t]
@@ -75,10 +86,12 @@ when defined(nimStackTraceOverride):
       if entry.procname.isNil and entry.programCounter != 0:
         programCounters.add(cast[cuintptr_t](entry.programCounter))
       elif entry.procname.isNil and (entry.line == reraisedFromBegin or entry.line == reraisedFromEnd):
-        result.add(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))
+        result.addStackTraceEntrySeq(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))
         programCounters = @[]
         result.add(entry[])
+        patchStackTraceEntry(result[result.high])
       else:
         result.add(entry[])
+        patchStackTraceEntry(result[result.high])
     if programCounters.len > 0:
-      result.add(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))
+      result.addStackTraceEntrySeq(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))