diff --git a/app/Http/Middleware/Locale.php b/app/Http/Middleware/Locale.php
index c16902ca..2f6472d4 100644
--- a/app/Http/Middleware/Locale.php
+++ b/app/Http/Middleware/Locale.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Carbon\Carbon;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -28,6 +29,7 @@ class Locale
         $locale = self::$languageMaps[$language->site_lang_folder] ?? 'en';
         do_log("set locale: " . $locale);
         App::setLocale($locale);
+        Carbon::setLocale($locale);
 
         /** @var Response $response */
         $response = $next($request);
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 5904a028..e99aa584 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -29,6 +29,6 @@ class AppServiceProvider extends ServiceProvider
     {
 //        JsonResource::withoutWrapping();
         DB::connection(config('database.default'))->enableQueryLog();
-//        Nexus::boot();
+
     }
 }
diff --git a/nexus/Nexus.php b/nexus/Nexus.php
index 73e02118..21d6e7b1 100644
--- a/nexus/Nexus.php
+++ b/nexus/Nexus.php
@@ -129,6 +129,12 @@ final class Nexus
         }
         foreach ($fields as $field) {
             $result = $servers[$field] ?? null;
+            if ($result && in_array($field, ['HTTP_X_FORWARDED_FOR', 'x-forwarded-for'])) {
+                $result = preg_split('/[,\s]+/', $result);
+            }
+            if (is_array($result)) {
+                $result = Arr::first($result);
+            }
             if ($result !== null && $result !== '') {
                 return $result;
             }