diff --git a/modules/wavefile.cpp b/modules/wavefile.cpp
index b85dd707..d13b273a 100644
--- a/modules/wavefile.cpp
+++ b/modules/wavefile.cpp
@@ -87,14 +87,14 @@ public:
 class Disconnector : public Thread
 {
 public:
-    Disconnector(CallEndpoint* chan, const String& id, bool source, bool disc);
+    Disconnector(CallEndpoint* chan, const String& id, DataSource* source, bool disc);
     virtual ~Disconnector();
     virtual void run();
     bool init();
 private:
     RefPointer<CallEndpoint> m_chan;
     Message* m_msg;
-    bool m_source;
+    DataSource* m_source;
     bool m_disc;
 };
 
@@ -276,6 +276,7 @@ void WaveSource::run()
 	if (!alive())
 	    return;
     }
+    DDebug(&__plugin,DebugAll,"Consumer found, starting to play data with rate %d [%p]",m_brate,this);
     m_data.assign(0,(m_brate*20)/1000);
     // start counting time from now
     u_int64_t tpos = Time::now();
@@ -304,13 +305,13 @@ void WaveSource::run()
 	    Thread::usleep((unsigned long)dly);
 	}
 	if (!alive())
-	    break;
+	    return;
 	Forward(m_data,ts);
 	ts += m_data.length()*8000/m_brate;
 	m_total += r;
 	tpos += (r*(u_int64_t)1000000/m_brate);
     } while (r > 0);
-    Debug(&__plugin,DebugAll,"WaveSource [%p] end of data [%p] [%s] ",this,m_chan,m_id.c_str());
+    Debug(&__plugin,DebugAll,"WaveSource '%s' end of data (%u played) chan=%p [%p]",m_id.c_str(),m_total,m_chan,this);
     // at cleanup time deref the data source if we start no disconnector thread
     m_autoclean = !notify();
 }
@@ -336,7 +337,7 @@ void WaveSource::setNotify(const String& id)
 bool WaveSource::notify()
 {
     if (m_id || m_autoclose) {
-	Disconnector *disc = new Disconnector(m_chan,m_id,true,m_autoclose);
+	Disconnector *disc = new Disconnector(m_chan,m_id,this,m_autoclose);
 	return disc->init();
     }
     return false;
@@ -396,7 +397,7 @@ void WaveConsumer::Consume(const DataBlock& data, unsigned long tStamp)
 		m_fd = -1;
 	    }
 	    if (m_chan) {
-		Disconnector *disc = new Disconnector(m_chan,m_id,false,false);
+		Disconnector *disc = new Disconnector(m_chan,m_id,0,false);
 		m_chan = 0;
 		disc->init();
 	    }
@@ -404,7 +405,7 @@ void WaveConsumer::Consume(const DataBlock& data, unsigned long tStamp)
     }
 }
 
-Disconnector::Disconnector(CallEndpoint* chan, const String& id, bool source, bool disc)
+Disconnector::Disconnector(CallEndpoint* chan, const String& id, DataSource* source, bool disc)
     : m_chan(chan), m_msg(0), m_source(source), m_disc(disc)
 {
     if (id) {
@@ -433,12 +434,16 @@ bool Disconnector::init()
 
 void Disconnector::run()
 {
-    DDebug(&__plugin,DebugAll,"Disconnector::run() chan=%p msg=%p",
-	(void*)m_chan,m_msg);
+    DDebug(&__plugin,DebugAll,"Disconnector::run() chan=%p msg=%p source=%s disc=%s",
+	(void*)m_chan,m_msg,String::boolText(m_source),String::boolText(m_disc));
     if (!m_chan)
 	return;
     if (m_source) {
-	m_chan->setSource();
+	if (m_chan->getSource() == m_source)
+	    m_chan->setSource();
+	else
+	    Debug(&__plugin,DebugMild,"Source %p in channel %p was replaced with %p",
+		m_source,(void*)m_chan,m_chan->getSource());
 	if (m_disc)
 	    m_chan->disconnect("eof");
     }