     }
 
     private func showTagEditor(tagIndex: Int) -> TagEditorViewController {
-        self.tagEditorViewController.feed = self.feed
+        let tagEditorViewController = self.tagEditorViewController()
+        tagEditorViewController.feed = self.feed
         if tagIndex < self.feed?.tags.count {
-            self.tagEditorViewController.tagIndex = tagIndex
-            self.tagEditorViewController.tagPicker.textField.text = self.feed?.tags[tagIndex]
-        }
-        self.navigationController?.pushViewController(self.tagEditorViewController, animated: true)
-        return self.tagEditorViewController
+            tagEditorViewController.tagIndex = tagIndex
+            tagEditorViewController.tagPicker.textField.text = self.feed?.tags[tagIndex]
+        }
+        self.navigationController?.pushViewController(tagEditorViewController, animated: true)
+        return tagEditorViewController
     }
 
     // MARK: - Table view data source

    private let urlSession: NSURLSession
    private let operationQueue: NSOperationQueue
    private let themeRepository: ThemeRepository
    private let tagEditorViewController: TagEditorViewController

    private let intervalFormatter = NSDateIntervalFormatter()


            urlSession: injector.create(NSURLSession)!,
            operationQueue: injector.create(kBackgroundQueue) as! NSOperationQueue,
            themeRepository: injector.create(ThemeRepository)!,
            tagEditorViewController: {injector.create(TagEditorViewController)!}
        )
    }

