Bug fix on autoplay