Fix auto next