AutoPlay bug fix