Applying v2.0.4 changes for random play function