--- cdataratechannel.h.orig	2015-12-11 14:39:41.739205641 +0100
+++ cdataratechannel.h	2015-12-11 14:41:53.415206750 +0100
@@ -82,6 +82,11 @@
     virtual ~cDatarateChannel();
 
     /**
+     * finish emits last busy signal
+     */
+    virtual void finish() override;
+
+    /**
      * Utility function for dynamic channel creation. Equivalent to
      * <tt>cChannelType::getDatarateChannelType()->create(name)</tt>.
      */

--- cdataratechannel.cc.orig	2015-12-09 14:56:32.000000000 +0100
+++ cdataratechannel.cc	2015-12-11 14:38:15.323204914 +0100
@@ -52,6 +52,14 @@
 {
 }
 
+void cDatarateChannel::finish()
+{
+    if (txFinishTime != 0 && mayHaveListeners(channelBusySignal)) {
+        cTimestampedValue tmp(txFinishTime, 0L);
+        emit(channelBusySignal, &tmp);
+    }
+}
+
 cDatarateChannel *cDatarateChannel::create(const char *name)
 {
     return dynamic_cast<cDatarateChannel *>(cChannelType::getDatarateChannelType()->create(name));
@@ -142,6 +150,11 @@
         return;
     }
 
+    if (txFinishTime != 0 && mayHaveListeners(channelBusySignal)) {
+        cTimestampedValue tmp(txFinishTime, 0L);
+        emit(channelBusySignal, &tmp);
+    }
+
     // datarate modeling
     if ((flags & FL_DATARATE_NONZERO) && msg->isPacket()) {
         cPacket *pkt = (cPacket *)msg;
@@ -177,10 +190,6 @@
     if (mayHaveListeners(channelBusySignal)) {
         cTimestampedValue tmp(t, 1L);
         emit(channelBusySignal, &tmp);
-
-        tmp.timestamp = txFinishTime;
-        tmp.l = 0L;
-        emit(channelBusySignal, &tmp);
     }
 }
 
@@ -188,8 +197,6 @@
 {
     //TODO record this into the eventlog so that it can be visualized in the sequence chart
     txFinishTime = t;
-    cTimestampedValue tmp(t, 0L);
-    emit(channelBusySignal, &tmp);
 }
 
 }  // namespace omnetpp