diff --git a/lua/nvim-tree/diagnostics.lua b/lua/nvim-tree/diagnostics.lua
index 6bc03e29..42cd7ed4 100644
--- a/lua/nvim-tree/diagnostics.lua
+++ b/lua/nvim-tree/diagnostics.lua
@@ -14,7 +14,7 @@ local function get_severity(diagnostics)
 end
 
 local function highlight_node(node, linenr)
-  local buf = require'nvim-tree.lib'.Tree.bufnr
+  local buf = require'nvim-tree.view'.View.bufnr
   if not vim.fn.bufexists(buf) or not vim.fn.bufloaded(buf) then return end
   local line = a.nvim_buf_get_lines(buf, linenr, linenr+1, false)[1]
   local starts_at = vim.fn.stridx(line, node.name)
diff --git a/lua/nvim-tree/utils.lua b/lua/nvim-tree/utils.lua
index ee2ed41f..c09e967e 100644
--- a/lua/nvim-tree/utils.lua
+++ b/lua/nvim-tree/utils.lua
@@ -76,8 +76,9 @@ function M.find_node(nodes, fn)
       local n, idx = M.find_node(node.entries, fn)
       i = i + idx
       if n then return n, i end
+    else
+      i = i + 1
     end
-    i = i + 1
   end
   return nil, i
 end