Index: trunk/FACT++/src/fad.cc
===================================================================
--- trunk/FACT++/src/fad.cc	(revision 10925)
+++ trunk/FACT++/src/fad.cc	(revision 10926)
@@ -231,13 +231,9 @@
 
             case kCmdWriteRunNumberMSW:
-                fRunNumber &= 0xffff;
-                fRunNumber |= fBufCommand[0]<<16;
-                cout << "-> RunNumber MSW" << endl;
+                fCommand = fBufCommand;
                 break;
 
             case kCmdWriteRunNumberLSW:
-                fRunNumber &= 0xffff0000;
-                fRunNumber |= fBufCommand[0];
-                cout << "-> RunNumber LSW" << endl;
+                fCommand = fBufCommand;
                 break;
 
@@ -273,4 +269,14 @@
         switch (fCommand[0])
         {
+        case kCmdWriteRunNumberMSW:
+            fRunNumber &= 0xffff;
+            fRunNumber |= fBufCommand[0]<<16;
+            cout << "-> Set RunNumber MSW" << endl;
+            break;
+        case kCmdWriteRunNumberLSW:
+            fRunNumber &= 0xffff0000;
+            fRunNumber |= fBufCommand[0];
+            cout << "-> Set RunNumber LSW" << endl;
+            break;
         case kCmdWriteRoi:
             cout << "-> Set Roi[" << fCommand[1] << "]=" << fBufCommand[0] << endl;
@@ -304,4 +310,5 @@
         fTriggerEnabled=false;
         fCommandSocket=true;
+        fRunNumber = 1;
 
         fHeader.fStartDelimiter = FAD::kDelimiterStart;