diff --git a/Models/Api/ModelBinder.cs b/Models/Api/ModelBinder.cs
index 0bab211..40f3915 100644
--- a/Models/Api/ModelBinder.cs
+++ b/Models/Api/ModelBinder.cs
@@ -100,17 +100,17 @@ namespace NejCommon.Models
                         ? bindingContext.ModelName
                         : routeValue.Name;
 
+                var result = bindingContext.ValueProvider.GetValue(name);
                 // If these really are route values, don't go through the entire
                 // MVC ValueProvider infrastructure.
-                if (!bindingContext.ActionContext.RouteData.Values.TryGetValue(name, out var rawValue) ||
-                    rawValue is null)
+                if (result == ValueProviderResult.None)
                 {
                     bindingContext.ModelState.AddModelError(name, "Route value not found");
                     bindingContext.Result = ModelBindingResult.Failed();
                     return;
                 }
 
-                values[i] = rawValue.ToString()!;
+                values[i] = result.FirstValue!;
             }
 
             // Check if all the required route values are present