Fix auto start