Fixed the supervisor/controller complex statemachi