Better handling of auto_switch activation