Make switch of music work okay