--- a/src/DAF/CDAP/CDAP.cc
+++ b/src/DAF/CDAP/CDAP.cc
@@ -29,9 +29,10 @@
         CDAPMessage* cmsg = check_and_cast<CDAPMessage*>(msg);
         cmsg->setHandle(cmsg->getArrivalGate()->getIndex());
         signalizeReceiveData(cmsg);
+        //delete cmsg;
     }
     //FIXME: Vesely - Proper disposing of object
-    //delete msg;
+    //cancelAndDelete(msg);
 }
 
 void CDAP::initSignalsAndListeners() {