Fix auto behavior