diff --git a/AspNetCoreRequestTracing.Tests/Server/Startup.cs b/AspNetCoreRequestTracing.Tests/Server/Startup.cs
index 77b10d1..d74f658 100644
--- a/AspNetCoreRequestTracing.Tests/Server/Startup.cs
+++ b/AspNetCoreRequestTracing.Tests/Server/Startup.cs
@@ -17,7 +17,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMvc();
 #endif
 
-#if NETCOREAPP3_0
+#if NETCOREAPP3_0_OR_GREATER
             services.AddControllers();
 #endif
         }
@@ -28,7 +28,7 @@ public void Configure(IApplicationBuilder app)
 #if NETCOREAPP2_2
             app.UseMvc();
 #endif
-#if NETCOREAPP3_0
+#if NETCOREAPP3_0_OR_GREATER
             app.UseRouting();
             app.UseEndpoints(endpoints => endpoints.MapControllers());
 #endif
diff --git a/AspNetCoreRequestTracing/AspNetCoreRequestTracing.csproj b/AspNetCoreRequestTracing/AspNetCoreRequestTracing.csproj
index 1fc697b..353e131 100644
--- a/AspNetCoreRequestTracing/AspNetCoreRequestTracing.csproj
+++ b/AspNetCoreRequestTracing/AspNetCoreRequestTracing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0</TargetFrameworks>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -20,6 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" Condition="'$(TargetFramework)'=='netcoreapp2.1'" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" Condition="'$(TargetFramework)'=='netcoreapp2.1'" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)'=='netcoreapp3.0'" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)'=='net5.0'" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.2.2" />
   </ItemGroup>
 
diff --git a/AspNetCoreRequestTracing/RequestTracingMiddleware.cs b/AspNetCoreRequestTracing/RequestTracingMiddleware.cs
index c4d786e..42b8e4c 100644
--- a/AspNetCoreRequestTracing/RequestTracingMiddleware.cs
+++ b/AspNetCoreRequestTracing/RequestTracingMiddleware.cs
@@ -62,7 +62,7 @@ public async Task Invoke(HttpContext context, IOptions<RequestTracingMiddlewareO
 #if NETCOREAPP2_1
             context.Request.EnableRewind();
 #endif
-#if NETCOREAPP3_0
+#if NETCOREAPP3_0_OR_GREATER
             context.Request.EnableBuffering();
 #endif
 
@@ -99,7 +99,8 @@ private bool IsMatch(IEnumerable<string> pathMatches, HttpRequest request)
             {
                 try
                 {
-                    if (Regex.IsMatch(request.Path, pathMatch))
+                    string path = string.Concat(request.PathBase, request.Path);
+                    if (Regex.IsMatch(path, pathMatch))
                     {
                         return true;
                     }
diff --git a/AspNetCoreRequestTracing/RequestTracingMiddlewareLoggerExtensions.cs b/AspNetCoreRequestTracing/RequestTracingMiddlewareLoggerExtensions.cs
index a8d1a9f..2816de8 100644
--- a/AspNetCoreRequestTracing/RequestTracingMiddlewareLoggerExtensions.cs
+++ b/AspNetCoreRequestTracing/RequestTracingMiddlewareLoggerExtensions.cs
@@ -70,7 +70,7 @@ public static async Task RequestTrace(this ILogger logger, HttpRequest request)
             _requestTrace(
                 logger,
                 request.Method,
-                $"{request.Scheme}://{request.Host}{request.Path}{request.QueryString}",
+                $"{request.Scheme}://{request.Host}{request.PathBase}{request.Path}{request.QueryString}",
                 request.Protocol,
                 request.Headers.AllHeadersAsString(),
                 request.Body == null ? string.Empty : await new StreamReader(request.Body).ReadToEndAsync(),