diff --git a/gst/gstbin.c b/gst/gstbin.c
index b20062a477..a7eef09c11 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -572,8 +572,7 @@ gst_bin_create_plan_func (GstBin *bin)
   GSList *pending = NULL;
   GstBin *pending_bin;
 
-  GST_DEBUG_SET_STRING("(\"%s\")",gst_element_get_name (GST_ELEMENT (bin)));
-  GST_DEBUG_ENTER_STRING;
+  GST_DEBUG_ENTER("(\"%s\")",gst_element_get_name (GST_ELEMENT (bin)));
 
   GST_INFO_ELEMENT (GST_CAT_PLANNING, bin, "creating plan");
 
@@ -710,8 +709,7 @@ gst_bin_iterate_func (GstBin *bin)
   GstPad *pad;
   GstBuffer *buf = NULL;
 
-  GST_DEBUG_SET_STRING("(\"%s\")", gst_element_get_name (GST_ELEMENT (bin)));
-  GST_DEBUG_ENTER_STRING;
+  GST_DEBUG_ENTER("(\"%s\")", gst_element_get_name (GST_ELEMENT (bin)));
 
   g_return_if_fail (bin != NULL);
   g_return_if_fail (GST_IS_BIN (bin));
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 5114a24ba5..f53c638bdd 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -82,6 +82,7 @@ G_GNUC_UNUSED static gchar *_debug_string = NULL;
     fprintf(stderr,GST_DEBUG_PREFIX(format": entering\n" , ## args )); \
 }G_STMT_END
 
+// FIXME FIXME FIXME this leaks like crazy
 #define GST_DEBUG_SET_STRING(format, args...) \
   gchar *_debug_string = g_strdup_printf(format , ## args )
 
diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c
index 96d12a4478..4cdd286f5c 100644
--- a/gst/gstscheduler.c
+++ b/gst/gstscheduler.c
@@ -328,8 +328,7 @@ void gst_bin_schedule_func(GstBin *bin) {
   GList *chains;
   _GstBinChain *chain;
 
-  GST_DEBUG_SET_STRING("(\"%s\")",gst_element_get_name (GST_ELEMENT (bin)));
-  GST_DEBUG_ENTER_STRING;
+  GST_DEBUG_ENTER("(\"%s\")",gst_element_get_name (GST_ELEMENT (bin)));
 
   gst_bin_schedule_cleanup(bin);