diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
index af7cb959..075d6467 100644
--- a/src/Commands/QueryCommits.cs
+++ b/src/Commands/QueryCommits.cs
@@ -51,13 +51,13 @@ namespace SourceGit.Commands
                         break;
                     case 7:
                         _current.Subject = line;
+                        nextPartIdx = -1;
                         break;
                     default:
                         break;
                 }
 
                 nextPartIdx++;
-                if (nextPartIdx == 8) nextPartIdx = 0;
                 
                 start = end + 1;
                 end = rs.StdOut.IndexOf('\n', start);