diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
index cc2607a5..3e8f9953 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
@@ -394,6 +394,7 @@ namespace RMuseum.Services.Implementation
 
                                                     if (anyChanges)
                                                     {
+                                                        await _FillPoemCoupletIndices(context, poemId);
                                                         GanjoorComment sysComment = new GanjoorComment()
                                                         {
                                                             UserId = userId,
@@ -749,6 +750,8 @@ namespace RMuseum.Services.Implementation
                         await context.SaveChangesAsync();//id set should be in order
                     }
 
+                    await _FillPoemCoupletIndices(context, poemId);
+
                     try
                     {
                         var poemRhymeLettersRes = LanguageUtils.FindRhyme(poemVerses);
diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs
index da5384ad..3d22c6c7 100644
--- a/RMuseum/Services/Implementation/GanjoorService.cs
+++ b/RMuseum/Services/Implementation/GanjoorService.cs
@@ -3025,6 +3025,8 @@ namespace RMuseum.Services.Implementation
                         _context.GanjoorVerses.Remove(oldVerses[v]);
                     }
                 }
+
+                await _FillPoemCoupletIndices(_context, id);
             }
             try
             {