Index: trunk/FACT++/src/StateMachineDimControl.cc
===================================================================
--- trunk/FACT++/src/StateMachineDimControl.cc	(revision 14666)
+++ trunk/FACT++/src/StateMachineDimControl.cc	(revision 14667)
@@ -297,6 +297,7 @@
 {
     fMutex.lock();
-    const State state = dim->description();
-    fCurrentStateList[server] = State(state.index, state.index==DimState::kNotAvailable?"":state.name, state.comment, state.time);
+    const State descr = dim->description();
+    const State state = State(dim->state(), descr.index==DimState::kNotAvailable?"":descr.name, descr.comment, dim->cur.first);
+    fCurrentStateList[server] = state;
     fMutex.unlock();
 
@@ -317,6 +318,19 @@
 {
     fMutex.lock();
+
+    const auto is = fCurrentStateList.find(server);
     for (auto it=dim->states.begin(); it!=dim->states.end(); it++)
+    {
         fStateDescriptionList[make_pair(server, it->index)] = make_pair(it->name, it->comment);
+        if (is==fCurrentStateList.end())
+            continue;
+
+        if (is->first==it->index)
+        {
+            is->second.name    = it->name;
+            is->second.comment = it->comment;
+        }
+    }
+
     fMutex.unlock();