diff --git a/Projects/SAMufasaGUI/framefunctionlist.pas b/Projects/SAMufasaGUI/framefunctionlist.pas
index aace4fd..5e2b3b9 100644
--- a/Projects/SAMufasaGUI/framefunctionlist.pas
+++ b/Projects/SAMufasaGUI/framefunctionlist.pas
@@ -84,7 +84,8 @@ end;
 procedure TFunctionListFrame.FillThreadTerminate(Sender: TObject);
 begin
   FillThread.Analyzer.Free;
-  FreeAndNil(FillThread);
+  { Don't free the thread when it is already stopped... This causes deadlocks? }
+  //FreeAndNil(FillThread);
   ScriptNode.Expand(true);
   FunctionList.EndUpdate;
   if Filtering then