Index: Slim/Schema/Track.pm
===================================================================
--- Slim/Schema/Track.pm        (revision 15023)
+++ Slim/Schema/Track.pm        (working copy)
@@ -96,15 +96,16 @@
        my $self = shift;

        # Bug 3824 - check for both types, in the case that an ALBUMARTIST was set.
-       return $self->contributorsOfType('ARTIST')->single ||
+       return $self->contributorsOfType('COMPOSER')->single ||
+              $self->contributorsOfType('ARTIST')->single ||
               $self->contributorsOfType('TRACKARTIST')->single;
 }

 sub artists {
        my $self = shift;

-       # Bug 4024 - include both ARTIST & TRACKARTIST here.
-       return $self->contributorsOfType(qw(ARTIST TRACKARTIST))->all;
+       # Bug 4024 - include both ARTIST & TRACKARTIST here. # RV
+       return $self->contributorsOfType(qw(ARTIST TRACKARTIST COMPOSER))->all;
 }

 sub artistsWithAttributes {