Fixed the transitions between control modes