Fixed up flow between controllers