diff --git a/lib/fluent/plugin/in_tail.rb b/lib/fluent/plugin/in_tail.rb
index 3d32d6a057..4eaff98bab 100644
--- a/lib/fluent/plugin/in_tail.rb
+++ b/lib/fluent/plugin/in_tail.rb
@@ -647,7 +647,7 @@ def detach_watcher(tw, ino, close_io = true)
 
       tw.close if close_io
 
-      if @pf && tw.unwatched && (@follow_inode || !@tails[tw.path])
+      if @pf && tw.unwatched && (@follow_inodes || !@tails[tw.path])
         target_info = TargetInfo.new(tw.path, ino)
         @pf.unwatch(target_info)
       end
@@ -751,7 +751,7 @@ def convert_line_to_event(line, es, tail_watcher)
           else
             if @emit_unmatched_lines
               record = {'unmatched_line' => line}
-              record[@path_key] ||= tail_watcher.path unless @path_key.nil?
+            record[@path_key] ||= tw.path unless @path_key.nil?
               es.add(Fluent::EventTime.now, record)
             end
             log.warn { "pattern not matched: #{line.inspect}" }