diff --git a/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs b/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs
index 15babaf..3ffca75 100644
--- a/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs
+++ b/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs
@@ -94,6 +94,14 @@ namespace Ink_Canvas {
 
             // end hittest
             hitTester.EndHitTesting();
+
+            // commit stroke erased history
+            // 我有受虐倾向，被这个bug硬控10秒钟，请大家嘲笑我
+            if (ReplacedStroke != null || AddedStroke != null) {
+                timeMachine.CommitStrokeEraseHistory(ReplacedStroke, AddedStroke);
+                AddedStroke = null;
+                ReplacedStroke = null;
+            }
         }
 
         private void EraserGeometry_StrokeHit(object sender,
diff --git a/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs b/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs
index 3a284f7..b5adaa8 100644
--- a/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs
+++ b/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs
@@ -1558,11 +1558,6 @@ namespace Ink_Canvas {
             }
 
             isMouseDown = false;
-            if (ReplacedStroke != null || AddedStroke != null) {
-                timeMachine.CommitStrokeEraseHistory(ReplacedStroke, AddedStroke);
-                AddedStroke = null;
-                ReplacedStroke = null;
-            }
 
             if (_currentCommitType == CommitReason.ShapeDrawing && drawingShapeMode != 9) {
                 _currentCommitType = CommitReason.UserInput;