fix playback issue
prepare final fix