Fixes 2136: music keeps playing