diff --git a/TraceEventLogger/TraceEventLogger.cs b/TraceEventLogger/TraceEventLogger.cs
index 7647a10..da24d09 100644
--- a/TraceEventLogger/TraceEventLogger.cs
+++ b/TraceEventLogger/TraceEventLogger.cs
@@ -53,7 +53,7 @@ private void ProjectStartedHandler(object sender, ProjectStartedEventArgs args)
                 name = $"Project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId})",
                 ph = "B",
                 ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                tid = args.BuildEventContext.ProjectInstanceId,
+                tid = args.ThreadId,
                 pid = args.BuildEventContext.NodeId.ToString(),
                 args = new Dictionary<string, string> {{"targets", args.TargetNames}},
             };
@@ -69,7 +69,7 @@ private void ProjectStartedHandler(object sender, ProjectStartedEventArgs args)
                     name = $"MSBuild \"{args.ProjectFile}\"",
                     ph = "s",
                     ts = (callingMsbuildTaskInvocation.Timestamp - firstObservedTime).TotalMicroseconds() + 1,
-                    tid = args.ParentProjectBuildEventContext.ProjectInstanceId,
+                    tid = args.ThreadId,
                     pid = args.ParentProjectBuildEventContext.NodeId.ToString(),
                     args = new Dictionary<string, string> {{"targets", args.TargetNames}},
                     id = args.BuildEventContext.BuildRequestId.ToString(),
@@ -83,7 +83,7 @@ private void ProjectStartedHandler(object sender, ProjectStartedEventArgs args)
                     name = $"MSBuild \"{args.ProjectFile}\"",
                     ph = "f",
                     ts = (args.Timestamp - firstObservedTime).TotalMicroseconds() - 1,
-                    tid = args.BuildEventContext.ProjectInstanceId,
+                    tid = args.ThreadId,
                     pid = args.BuildEventContext.NodeId.ToString(),
                     args = new Dictionary<string, string> {{"targets", args.TargetNames}},
                     id = args.BuildEventContext.BuildRequestId.ToString(),
@@ -100,7 +100,7 @@ private void ProjectFinishedHandler(object sender, ProjectFinishedEventArgs args
                 name = $"Project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId})",
                 ph = "E",
                 ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                tid = args.BuildEventContext.ProjectInstanceId,
+                tid = args.ThreadId,
                 pid = args.BuildEventContext.NodeId.ToString(),
             };
 
@@ -116,7 +116,7 @@ private void TargetStartedHandler(object sender, TargetStartedEventArgs args)
                     $"Target \"{args.TargetName}\" in project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId})",
                 ph = "B",
                 ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                tid = args.BuildEventContext.ProjectInstanceId,
+                tid = args.ThreadId,
                 pid = args.BuildEventContext.NodeId.ToString(),
             };
 
@@ -131,7 +131,7 @@ private void TargetFinishedHandler(object sender, TargetFinishedEventArgs args)
                     $"Target \"{args.TargetName}\" in project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId})",
                 ph = "E",
                 ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                tid = args.BuildEventContext.ProjectInstanceId,
+                tid = args.ThreadId,
                 pid = args.BuildEventContext.NodeId.ToString(),
             };
 
@@ -150,7 +150,7 @@ private void TaskStartedHandler(object sender, TaskStartedEventArgs args)
                         $"MSBuild (yielded) in project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId})",
                     ph = "B",
                     ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                    tid = args.BuildEventContext.ProjectInstanceId,
+                    tid = args.ThreadId,
                     pid = args.BuildEventContext.NodeId.ToString(),
                 };
 
@@ -168,7 +168,7 @@ private void TaskFinishedHandler(object sender, TaskFinishedEventArgs args)
                         $"MSBuild (yielded) in project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId})",
                     ph = "E",
                     ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                    tid = args.BuildEventContext.ProjectInstanceId,
+                    tid = args.ThreadId,
                     pid = args.BuildEventContext.NodeId.ToString(),
                 };
 
@@ -189,7 +189,7 @@ private void EventSourceOnAnyEventRaised(object sender, BuildEventArgs buildEven
                             $"Project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId}) evaluation",
                         ph = "B",
                         ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                        tid = args.BuildEventContext.ProjectInstanceId,
+                        tid = args.ThreadId,
                         pid = args.BuildEventContext.NodeId == BuildEventContext.InvalidNodeId ? "Evaluation" : args.BuildEventContext.NodeId.ToString(),
                     };
                     break;
@@ -200,7 +200,7 @@ private void EventSourceOnAnyEventRaised(object sender, BuildEventArgs buildEven
                             $"Project \"{args.ProjectFile}\" ({args.BuildEventContext.ProjectInstanceId}) evaluation",
                         ph = "E",
                         ts = (args.Timestamp - firstObservedTime).TotalMicroseconds(),
-                        tid = args.BuildEventContext.ProjectInstanceId,
+                        tid = args.ThreadId,
                         pid = args.BuildEventContext.NodeId == BuildEventContext.InvalidNodeId ? "Evaluation" : args.BuildEventContext.NodeId.ToString(),
                     };