diff --git a/autoload/gitgutter.vim b/autoload/gitgutter.vim
index 5eb2cb0..f70e1a9 100644
--- a/autoload/gitgutter.vim
+++ b/autoload/gitgutter.vim
@@ -222,13 +222,11 @@ function! gitgutter#quickfix(current_file)
   let lnum = 0
   for line in diff
     if line =~ '^diff --git [^"]'
-      let paths = line[11:]
-      let mid = (len(paths) - 1) / 2
-      let [fnamel, fnamer] = [paths[:mid-1], paths[mid+1:]]
-      let fname = fnamel ==# fnamer ? fnamel : fnamel[2:]
+      let [fnamel, fnamer] = split(line)[2:3]
+      let fname = fnamel ==# fnamer ? fnamer : fnamer[2:]
     elseif line =~ '^diff --git "'
       let [_, fnamel, _, fnamer] = split(line, '"')
-      let fname = fnamel ==# fnamer ? fnamel : fnamel[2:]
+      let fname = fnamel ==# fnamer ? fnamer : fnamer[2:]
     elseif line =~ '^diff --cc [^"]'
       let fname = line[10:]
     elseif line =~ '^diff --cc "'