Fixing auto start detection