Fixing auto play & cancel