diff --git a/src/gcal-week-view.c b/src/gcal-week-view.c
index b131b07b..a6f2ace4 100644
--- a/src/gcal-week-view.c
+++ b/src/gcal-week-view.c
@@ -801,16 +801,15 @@ gcal_week_view_add (GtkContainer *container,
 
   for (l = priv->days[day - 1]; l != NULL; l = l->next)
     {
-      GcalWeekViewChild *child;
+      GtkWidget *event;
 
-      child = (GcalWeekViewChild*) l->data;
-
-      if (g_strcmp0 (
-            gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget)),
-            gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget))) == 0)
+      event = GTK_WIDGET (((GcalWeekViewChild*) l->data)->widget);
+      if (gcal_event_widget_equal (GCAL_EVENT_WIDGET (widget),
+                                   GCAL_EVENT_WIDGET (event)))
         {
           //TODO: remove once the main-dev phase its over
           g_warning ("Trying to add an event with the same uuid to the view");
+          g_object_unref (widget); /* FIXME: check if this destroy it */
           return;
         }
     }
diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c
index 0522dc09..880b5a0b 100644
--- a/src/gcal-year-view.c
+++ b/src/gcal-year-view.c
@@ -622,16 +622,15 @@ gcal_year_view_add (GtkContainer *container,
 
   for (l = priv->months[date->month - 1]; l != NULL; l = l->next)
     {
-      GcalViewChild *child;
+      GtkWidget *event;
 
-      child = (GcalViewChild*) l->data;
-      if (g_strcmp0 (
-            gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget)),
-            gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget)))
-          == 0)
+      event = GTK_WIDGET (((GcalViewChild*) l->data)->widget);
+      if (gcal_event_widget_equal (GCAL_EVENT_WIDGET (widget),
+                                   GCAL_EVENT_WIDGET (event)))
         {
           //TODO: remove once the main-dev phase its over
           g_warning ("Trying to add an event with the same uuid to the view");
+          g_object_unref (widget); /* FIXME: check if this destroy it */
           return;
         }
     }