diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php
index ce8e2b2..0ea8666 100644
--- a/app/Http/Controllers/ChartController.php
+++ b/app/Http/Controllers/ChartController.php
@@ -105,7 +105,7 @@ class ChartController extends Controller
         $riceShrimpWeeklyPricesTable = (new RiceShrimpWeeklyPrice)->getTable();
 
         $latestPrice = RiceShrimpWeeklyPrice::query()
-            ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', "$keywordsTable.key"))
+            ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', DB::raw("$keywordsTable.key::INTEGER")))
             ->where("$keywordsTable.type_key", 'weeks-per-year')
             ->latest("$riceShrimpWeeklyPricesTable.year")
             ->latest(DB::raw("$keywordsTable.key::INTEGER"))
diff --git a/app/Http/Controllers/WeeksPerYearController.php b/app/Http/Controllers/WeeksPerYearController.php
index 06dfbeb..dba7b0a 100644
--- a/app/Http/Controllers/WeeksPerYearController.php
+++ b/app/Http/Controllers/WeeksPerYearController.php
@@ -12,6 +12,6 @@ class WeeksPerYearController extends Controller
     {
         $keywords = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key');
 
-        return $keywords->map(fn ($item) => ['id' => $item->key, 'name' => $item->name])->values();
+        return $keywords->map(fn ($name, $key) => ['id' => $key, 'name' => $name])->values();
     }
 }