diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py
index 91f46ce..211e95f 100644
--- a/lib/tfw/networking/server/tfw_server.py
+++ b/lib/tfw/networking/server/tfw_server.py
@@ -30,8 +30,7 @@ class TFWServer:
         except AttributeError: return False
 
     def fsm_callback(self, kwargs_dict):
-        response, key = self.generate_fsm_update()  # TODO: unify (key,response) order
-        self.uplink.send(key, response)
+        self.uplink.send(*self.generate_fsm_update())
 
     def generate_fsm_update(self):
         key = 'FSMUpdate'
@@ -39,7 +38,7 @@ class TFWServer:
                     'data': {'current_state': self.fsm.state,
                              'valid_transitions':
                                  [{'trigger': trigger} for trigger in self.fsm.machine.get_triggers(self.fsm.state)]}}
-        return response, key
+        return key, response
 
     def listen(self, port):
         self.application.listen(port)