diff --git a/src/Gitonomy/Git/Parser/DiffParser.php b/src/Gitonomy/Git/Parser/DiffParser.php
index 15e6c03..b6386ee 100644
--- a/src/Gitonomy/Git/Parser/DiffParser.php
+++ b/src/Gitonomy/Git/Parser/DiffParser.php
@@ -45,8 +45,10 @@ protected function doParse()
             $vars = $this->consumeRegexp("/diff --git \"?(a\/.*?)\"? \"?(b\/.*?)\"?\n/");
             $oldName = $vars[1];
             $newName = $vars[2];
+            // Get indexes from raw if it exists
             $oldIndex = isset($indexes[$fileIndex]) ? $indexes[$fileIndex][0] : null;
             $newIndex = isset($indexes[$fileIndex]) ? $indexes[$fileIndex][1] : null;
+            $fileIndex++;
             $oldMode = null;
             $newMode = null;
 
diff --git a/tests/Gitonomy/Git/Tests/DiffTest.php b/tests/Gitonomy/Git/Tests/DiffTest.php
index e51fc7f..9703bdd 100644
--- a/tests/Gitonomy/Git/Tests/DiffTest.php
+++ b/tests/Gitonomy/Git/Tests/DiffTest.php
@@ -174,9 +174,8 @@ public function testDeleteFileWithoutRaw()
 
         $this->assertTrue($deprecationCalled);
         $this->assertFalse($firstFile->isCreation());
-        // TODO: Enable after #226 is merged
-        //$this->assertTrue($firstFile->isDeletion());
-        //$this->assertFalse($firstFile->isChangeMode());
+        $this->assertTrue($firstFile->isDeletion());
+        $this->assertFalse($firstFile->isChangeMode());
         $this->assertSame('e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', $firstFile->getOldIndex());
         $this->assertNull($firstFile->getNewIndex());
     }
@@ -216,23 +215,36 @@ public function testModeChangeFileWithRaw()
         }, E_USER_DEPRECATED);
 
         $diff = Diff::parse(<<<'DIFF'
-        :100755 100644 d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa81 d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa81 M      a.out
+        :100644 100755 d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa81 d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa81 M        testfile
+        :100644 100755 d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa82 d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa82 M        testfile2
 
-        diff --git a/a.out b/a.out
-        old mode 100755
-        new mode 100644
+        diff --git a/testfile b/testfile
+        old mode 100644
+        new mode 100755
+        diff --git a/testfile2 b/testfile2
+        old mode 100644
+        new mode 100755
 
         DIFF);
-        $firstFile = $diff->getFiles()[0];
+        $files = $diff->getFiles();
+        $firstFile = $files[0];
+        $secondFile = $files[1];
 
         restore_exception_handler();
 
         $this->assertFalse($deprecationCalled);
+
         $this->assertFalse($firstFile->isCreation());
         $this->assertFalse($firstFile->isDeletion());
         $this->assertTrue($firstFile->isChangeMode());
         $this->assertSame('d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa81', $firstFile->getOldIndex());
         $this->assertSame('d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa81', $firstFile->getNewIndex());
+
+        $this->assertFalse($secondFile->isCreation());
+        $this->assertFalse($secondFile->isDeletion());
+        $this->assertTrue($secondFile->isChangeMode());
+        $this->assertSame('d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa82', $secondFile->getOldIndex());
+        $this->assertSame('d1af4b23d0cc9313e5b2d3ef2fb9696c94afaa82', $secondFile->getNewIndex());
     }
 
     public function testThrowErrorOnBlobGetWithoutIndex()