diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
index ece04249..8ea4026b 100644
--- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
+++ b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
@@ -330,9 +330,10 @@ namespace BotSharp.Core.Repository
                 var responses = FetchResponses(dir);
                 return record.SetInstruction(instruction)
                              .SetFunctions(functions)
-                             .SetSamples(samples)
                              .SetTemplates(templates)
-                             .SetResponses(responses);
+                             .SetSamples(samples)
+                             .SetResponses(responses)
+                             .SetTasks(tasks);
             }
 
             return null;
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs
index 18876af4..892fb923 100644
--- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs
+++ b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs
@@ -116,11 +116,11 @@ public partial class FileRepository : IBotSharpRepository
                     if (agent != null)
                     {
                         agent = agent.SetInstruction(FetchInstruction(d))
-                                     .SetTemplates(FetchTemplates(d))
-                                     .SetTasks(FetchTasks(d))
                                      .SetFunctions(FetchFunctions(d))
+                                     .SetTemplates(FetchTemplates(d))
                                      .SetResponses(FetchResponses(d))
-                                     .SetSamples(FetchSamples(d));
+                                     .SetSamples(FetchSamples(d))
+                                     .SetTasks(FetchTasks(d));
                         _agents.Add(agent);
                     }
                 }