     var currentTrack: MPMediaItem! {
         didSet {
             self.trackList = musicPlayer.query.items ?? []
-            self.indexOfCurrentTrack = trackList.indexOf(currentTrack) ?? 0
             self.tableView.reloadData()
         }
     }
-    
-    private var indexOfCurrentTrack: Int = 0
     
     override func loadView() {
         super.loadView()

    
    override func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
        tableView.deselectRowAtIndexPath(indexPath, animated: true)
        guard indexPath.row != indexOfCurrentTrack else { return }
        let newItem = trackList[indexPath.row]
        musicPlayer.nowPlayingItem = newItem
    }

    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
        let cell = tableView.dequeueReusableCellWithIdentifier(reuseIdentifier, forIndexPath: indexPath) as! AlbumListTableViewCell
        if let title = trackList[indexPath.row].valueForProperty(MPMediaItemPropertyTitle) as? String {
            cell.textLabel!.text = (indexPath.row == musicPlayer.indexOfNowPlayingItem ? "▶️ " : "") + "\(title)"
        }
        
        if let duration = trackList[indexPath.row].valueForProperty(MPMediaItemPropertyPlaybackDuration) as? Double {
