Fixed switching between scouts