Fixing the auto play issue