Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 13974)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 13975)
@@ -985,5 +985,5 @@
              "|Az[deg]:Azimuth");
 
-        T::AddEvent("TRACK", "D:2", State::kArmed)   // ->RADEC/GRB
+        T::AddEvent("TRACK", "D:2", State::kArmed, State::kTracking)   // ->RADEC/GRB
             (bind(&StateMachineDrive::SendCoordinates, this, placeholders::_1, kTrackSlow))
             ("Move the telescope to the given sky coordinates and start tracking them"
@@ -991,5 +991,5 @@
              "|Dec[deg]:Declination");
 
-        T::AddEvent("WOBBLE", "D:4", State::kArmed)   // ->RADEC/GRB
+        T::AddEvent("WOBBLE", "D:4", State::kArmed, State::kTracking)   // ->RADEC/GRB
             (bind(&StateMachineDrive::Wobble, this, placeholders::_1))
             ("Move the telescope to the given wobble position around the given sky coordinates and start tracking them"
@@ -999,5 +999,5 @@
              "|Angle[deg]:Wobble angle");
 
-        T::AddEvent("TRACK_SOURCE", "D:2;C", State::kArmed)   // ->RADEC/GRB
+        T::AddEvent("TRACK_SOURCE", "D:2;C", State::kArmed, State::kTracking)   // ->RADEC/GRB
             (bind(&StateMachineDrive::Track, this, placeholders::_1))
             ("Move the telescope to the given wobble position around the given source and start tracking"
@@ -1006,17 +1006,17 @@
              "|Name[string]:Source name");
 
-        T::AddEvent("MOON", State::kArmed)
+        T::AddEvent("MOON", State::kArmed, State::kTracking)
             (bind(&StateMachineDrive::SendCommand, this, "MOON 0 0", true))
             ("Start tracking the moon");
-        T::AddEvent("VENUS", State::kArmed)
+        T::AddEvent("VENUS", State::kArmed, State::kTracking)
             (bind(&StateMachineDrive::SendCommand, this, "CELEST 2 0 0", true))
             ("Start tracking Venus");
-        T::AddEvent("MARS", State::kArmed)
+        T::AddEvent("MARS", State::kArmed, State::kTracking)
             (bind(&StateMachineDrive::SendCommand, this, "CELEST 4 0 0", true))
             ("Start tracking Mars");
-        T::AddEvent("JUPITER", State::kArmed)
+        T::AddEvent("JUPITER", State::kArmed, State::kTracking)
             (bind(&StateMachineDrive::SendCommand, this, "CELEST 5 0 0", true))
             ("Start tracking Jupiter");
-        T::AddEvent("SATURN", State::kArmed)
+        T::AddEvent("SATURN", State::kArmed, State::kTracking)
             (bind(&StateMachineDrive::SendCommand, this, "CELEST 6 0 0", true))
             ("Start tracking Saturn");