Index: trunk/FACT++/src/MessageDim.cc
===================================================================
--- trunk/FACT++/src/MessageDim.cc	(revision 16579)
+++ trunk/FACT++/src/MessageDim.cc	(revision 16581)
@@ -57,8 +57,11 @@
     // to have them available already during startup
     Message("MessageDimTX shutting down ["+to_string(fMsgQueue.size())+"]");
+    fMsgQueue.wait();
 }
 
 void MessageDimTX::UpdateService(const tuple<Time,string,int> &data)
 {
+    MessageImp::Write(get<0>(data), get<1>(data), get<2>(data));
+
     setData(get<1>(data));
     setQuality(get<2>(data));
@@ -80,7 +83,5 @@
 int MessageDimTX::Write(const Time &t, const string &txt, int qos)
 {
-    MessageImp::Write(t, txt, qos);
     fMsgQueue.emplace(t, txt, qos);
-
     return 1;
 }