General: Fixed playback (Take 2)