Bugfix for playback