Fix auto-complete