Fix auto start timing