After playback bugs fixed