#304 Change to shuffle by album