diff --git a/ChangeLog b/ChangeLog
index ee5951dcd5..c612ffefff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-19  Julien MOUTTE  <julien@moutte.net>
+
+	* ext/pango/gsttextoverlay.c: (gst_text_overlay_finalize):
+	Polishing.
+
 2006-02-19  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/pango/gsttextoverlay.c: (gst_text_overlay_base_init),
diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c
index 9566b2d315..fcc523577a 100644
--- a/ext/pango/gsttextoverlay.c
+++ b/ext/pango/gsttextoverlay.c
@@ -1,6 +1,7 @@
 /* GStreamer
  * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
  * Copyright (C) <2003> David Schleef <ds@schleef.org>
+ * Copyright (C) <2006> Julien Moutte <julien@moutte.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -282,8 +283,10 @@ gst_text_overlay_finalize (GObject * object)
   g_free (overlay->default_text);
   g_free (overlay->bitmap.buffer);
 
-  if (overlay->layout)
+  if (overlay->layout) {
     g_object_unref (overlay->layout);
+    overlay->layout = NULL;
+  }
 
   if (overlay->segment) {
     gst_segment_free (overlay->segment);
@@ -396,7 +399,6 @@ gst_text_overlay_update_wrap_mode (GstTextOverlay * overlay)
   }
 }
 
-
 /* FIXME: upstream nego (e.g. when the video window is resized) */
 
 static gboolean