diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php
index 34cd875e..a059f132 100644
--- a/app/Filament/Widgets/Data/LoadEvents.php
+++ b/app/Filament/Widgets/Data/LoadEvents.php
@@ -202,8 +202,16 @@ class LoadEvents
                 }
                 if (isset($val_home) && isset($val_away)) {
                     $events[] = $value['home'].' vs '.$value['away'];
-                    $dataset_home[] = $val_home;
-                    $dataset_away[] = $val_away;
+
+                    if ($team_id == $value['home_id']) {
+                        $dataset_home[] = (int) $value['val_home'];
+                        $dataset_away[] = (int) $value['val_away'];
+                    } elseif ($team_id == $value['away_id']) {
+                        $dataset_home[] = (int) $value['val_away'];
+                        $dataset_away[] = (int) $value['val_home'];
+                    }
+                    // $dataset_home[] = $val_home;
+                    // $dataset_away[] = $val_away;
                 }
             }
 
diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php
index ddb6194b..c7d9b663 100644
--- a/app/Filament/Widgets/StatsMedianAverage.php
+++ b/app/Filament/Widgets/StatsMedianAverage.php
@@ -194,10 +194,10 @@ class StatsMedianAverage extends StatsOverviewWidget
                     ]);
 
                 // BOX 3
-                $boxes[] = Stat::make('Average '.$statistic_type, self::template_box3($home_team, $away_team, $value_away, $value_home))
+                $boxes[] = Stat::make('Average '.$statistic_type, self::template_box3($home_team, $away_team, $value_home, $value_away))
                     ->description('Team '.$team_position)
                     ->extraAttributes([
-                        'x-init' => "animate('average_home', $value_away); animate('average_away', $value_home)",
+                        'x-init' => "animate('average_home', $value_home); animate('average_away', $value_away)",
                         'class' => 'box-success',
                     ]);