diff --git a/gst/gobject2gtk.h b/gst/gobject2gtk.h
index 03bd676077..0a6964b7c8 100644
--- a/gst/gobject2gtk.h
+++ b/gst/gobject2gtk.h
@@ -225,7 +225,7 @@ g_signal_handlers_disconnect_by_func(object,func,func_data) \
 gtk_signal_disconnect_by_func((GtkObject *)object,func,func_data)
 
 #define \
-g_signal_connect_object(object,name,func,func_data) \
+g_signal_connect_swapped(object,name,func,func_data) \
 gtk_signal_connect_object((GtkObject *)object,name,func,(GtkObject*)func_data)
 
 #define \
diff --git a/gst/gstbin.c b/gst/gstbin.c
index 42a3f96b64..4cefcf6bc2 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -278,7 +278,7 @@ gst_bin_add (GstBin *bin,
 
   // set the element's parent and add the element to the bin's list of children
   gst_object_set_parent (GST_OBJECT (element), GST_OBJECT (bin));
-  g_signal_connect (G_OBJECT (element), "state_change", gst_bin_child_state_change, G_OBJECT (bin));
+  g_signal_connect_swapped (G_OBJECT (element), "state_change", gst_bin_child_state_change, G_OBJECT (bin));
 
   bin->children = g_list_append (bin->children, element);
   bin->numchildren++;
@@ -358,7 +358,7 @@ gst_bin_remove (GstBin *bin,
 }
 
 static void
-gst_bin_child_state_change (GstElement *child, GstElementState old, GstElementState new, GstBin *bin)
+gst_bin_child_state_change (GstBin *bin, GstElementState old, GstElementState new, GstElement *child)
 {
   gint old_idx = 0, new_idx = 0, i;