diff --git a/app/Filament/Widgets/ChartEvent.php b/app/Filament/Widgets/ChartEvent.php
index 45057cfe..619e90e6 100644
--- a/app/Filament/Widgets/ChartEvent.php
+++ b/app/Filament/Widgets/ChartEvent.php
@@ -72,7 +72,10 @@ class ChartEvent extends ChartWidget
                                     return [context.dataset.label+' '+context.dataset.data[0]];
                                 }
                                 else {
-                                    return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]];
+                                    if(context.dataset.playing_date[context.dataIndex])
+                                        return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]];
+                                    else 
+                                        return [' '+context.parsed.y]
                                 }
                             },
                         }
diff --git a/app/Filament/Widgets/Data/LoadEvents.php b/app/Filament/Widgets/Data/LoadEvents.php
index 066367ac..df959476 100644
--- a/app/Filament/Widgets/Data/LoadEvents.php
+++ b/app/Filament/Widgets/Data/LoadEvents.php
@@ -265,38 +265,37 @@ class LoadEvents
 
                 // dd($value);
 
-                $events[] = $value['home'] . ' vs ' . $value['away'];
-                $playing_date[] = $value['starttime']->format('Y-m-d H:i');
-                $results_per_event[] = $value['val_home'] . ' : ' . $value['val_away'];
+                // $events[] = $value['home'] . ' vs ' . $value['away'];
+                // $playing_date[] = $value['starttime']->format('Y-m-d H:i');
+                // $results_per_event[] = $value['val_home'] . ' : ' . $value['val_away'];
                 $labels[] = round($value['starttime']->diffInDays(Carbon::now()));
                 // Home playing HOME done and commited
                 if ($match->home_id == $value['home_id']) {
                     $dataset_home[] = (int) $value['val_home'];
                     $dataset_away[] = (int) $value['val_away'];
-                    // $dataset_home2[] = end($dataset_home2);
-                    // $dataset_away2[] = end($dataset_away2);
                 } else if ($match->home_id == $value['away_id']) {
                     $dataset_home[] = (int) $value['val_away'];
                     $dataset_away[] = (int) $value['val_home'];
-                    // $dataset_home2[] = end($dataset_home2);
-                    // $dataset_away2[] = end($dataset_away2);
                 }
                 // Home playing AWAY done and commited
                 else if ($match->away_id == $value['home_id']) {
-                    // $dataset_home[] = end($dataset_home);
-                    // $dataset_away[] = end($dataset_away);
                     $dataset_home2[] = (int) $value['val_home'];
                     $dataset_away2[] = (int) $value['val_away'];
                 } else if ($match->away_id == $value['away_id']) {
-                    // $dataset_home[] = end($dataset_home);
-                    // $dataset_away[] = end($dataset_away);
                     $dataset_home2[] = (int) $value['val_away'];
                     $dataset_away2[] = (int) $value['val_home'];
                 }
             }
+            $n = max(count($dataset_home), count($dataset_home2));
+            $f = array_first($labels);
+            $step = round($f / $n);
+            $labels = [];
+            for ($i = $f; $i >= 0; $i -= $step) {
+                $labels[] = $i;
+            }
         }
 
-        // dd($events, $dataset_home, $dataset_home2);
+        // dd($events, count($dataset_home), count($dataset_away), count($dataset_home2), count($dataset_away2));
 
 
         self::shortenEnding($labels, $dataset_home, $dataset_away);