diff --git a/ChangeLog b/ChangeLog
index 3ee558ffbf..bf4ad74db1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-08  Benjamin Otte  <otte@gnome.org>
+
+	* gst/gstpad.c: (gst_pad_proxy_fixate):
+	  really reduce the set of caps
+
 2004-05-08  Benjamin Otte  <otte@gnome.org>
 
 	* tests/Makefile.am:
diff --git a/gst/gstpad.c b/gst/gstpad.c
index c4fc02fdea..46d9f05ebe 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -2408,7 +2408,7 @@ gst_pad_proxy_fixate (GstPad * pad, const GstCaps * caps)
     if (otherpad != pad) {
       othercaps = gst_pad_get_negotiated_caps (otherpad);
 
-      if (othercaps) {
+      if (othercaps && !gst_caps_is_subset (caps, othercaps)) {
         GstCaps *icaps;
 
         icaps = gst_caps_intersect (othercaps, caps);