music: issue 154 and 156