Hopefully made music playback more robust