diff --git a/src/Models/CommitTemplate.cs b/src/Models/CommitTemplate.cs
index 57a88508..135d8ac9 100644
--- a/src/Models/CommitTemplate.cs
+++ b/src/Models/CommitTemplate.cs
@@ -55,7 +55,7 @@ namespace SourceGit.Models
                 {
                     var count = Math.Min(int.Parse(countStr.Substring(1)), changes.Count);
                     for (int j = 0; j < count; j++)
-                        paths.Add(changes[i].Path);
+                        paths.Add(changes[j].Path);
 
                     if (count < changes.Count)
                         more = $" and {changes.Count - count} other files";