Fix auto-switch breaking scp