diff --git a/Directory.Build.props b/Directory.Build.props
index 84bd21db..6374ce0a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
  <PropertyGroup>
    <LangVersion>10.0</LangVersion>
    <OutputPath>..\..\..\packages</OutputPath>
-   <BotSharpVersion>0.16.0</BotSharpVersion>
+   <BotSharpVersion>0.16.1</BotSharpVersion>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs b/src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs
index d80dc143..e85d9192 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs
@@ -41,6 +41,7 @@ public class RouteToAgentRoutingHandler : RoutingHandlerBase, IRoutingHandler
         var result = await routing.InvokeAgent(context.CurrentAgentId);
         // Keep last message data for debug
         result.ExecutionData = result.ExecutionData ?? message.ExecutionData;
+        result.FunctionName = result.FunctionName ?? message.FunctionName;
         return result;
     }
 }