- return Artist(name=self.albumartist or self.artist,
- mbid=self.musicbrainz_artistid)
+ name = self.artist
+ if self.albumartist and self.albumartist != 'Various Artists':
+ name = self.albumartist
+ return Artist(name=name, mbid=self.musicbrainz_artistid)