diff --git a/headers/private/media/MediaClient.h b/headers/private/media/MediaClient.h
index 43e13cb422..4d1fe1f62d 100755
--- a/headers/private/media/MediaClient.h
+++ b/headers/private/media/MediaClient.h
@@ -165,8 +165,8 @@ public:
 	// to ovverride it so that you can track something, in this case
 	// be sure to call the base version.
 	// Automatically recycle the BBuffer.
-	virtual	status_t				SendBuffer(BMediaConnection* connection,
-										BBuffer* buffer);
+	virtual	status_t				SendBuffer(BBuffer* buffer,
+										BMediaConnection* connection);
 
 	// This is supplied to support using this class in a BMediaAddOn.
 	// Default version just return NULL.
diff --git a/src/kits/media/MediaClient.cpp b/src/kits/media/MediaClient.cpp
index 911a093510..2687db1855 100755
--- a/src/kits/media/MediaClient.cpp
+++ b/src/kits/media/MediaClient.cpp
@@ -455,7 +455,7 @@ BMediaClient::PerformanceTime() const
 
 
 status_t
-BMediaClient::SendBuffer(BMediaConnection* connection, BBuffer* buffer)
+BMediaClient::SendBuffer(BBuffer* buffer, BMediaConnection* connection)
 {
 	CALLED();
 
diff --git a/src/tests/kits/media/media_client/media_client.cpp b/src/tests/kits/media/media_client/media_client.cpp
index 40fd5e0575..823f17fc4a 100644
--- a/src/tests/kits/media/media_client/media_client.cpp
+++ b/src/tests/kits/media/media_client/media_client.cpp
@@ -73,8 +73,10 @@ void _ProducerFilterConsumerTest()
 	BMediaConnection* filterInput = sFilter->BeginConnection(B_MEDIA_INPUT);
 	BMediaConnection* filterOutput = sFilter->BeginConnection(B_MEDIA_OUTPUT);
 
+	assert(sFilter->Bind(filterInput, filterOutput) == B_OK);
+
 	assert(sProducer->Connect(output, filterInput) == B_OK);
-	assert(sProducer->Connect(filterOutput, input) == B_OK);
+	assert(sFilter->Connect(filterOutput, input) == B_OK);
 
 	assert(sFilter->Disconnect() == B_OK);