Fix the direction of the override switch for the new state machine