Small changes in the autoplay bug