Fix auto-following