- Added playback related fix