diff --git a/src/ops.c b/src/ops.c
index 8c463033c..1c13dac64 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1586,35 +1586,26 @@ op_insert(oparg_T *oap, long count1)
 	    int t = getviscol2(curbuf->b_op_start_orig.col,
 					       curbuf->b_op_start_orig.coladd);
 
-	    if (!bd.is_MAX)
+	    if (oap->op_type == OP_INSERT
+		    && oap->start.col + oap->start.coladd
+			    != curbuf->b_op_start_orig.col
+					      + curbuf->b_op_start_orig.coladd)
 	    {
-		if (oap->op_type == OP_INSERT
-			&& oap->start.col + oap->start.coladd
-				!= curbuf->b_op_start_orig.col
-					      + curbuf->b_op_start_orig.coladd)
-		{
-		    oap->start.col = curbuf->b_op_start_orig.col;
-		    pre_textlen -= t - oap->start_vcol;
-		    oap->start_vcol = t;
-		}
-		else if (oap->op_type == OP_APPEND
-			&& oap->start.col + oap->start.coladd
-				>= curbuf->b_op_start_orig.col
-					      + curbuf->b_op_start_orig.coladd)
-		{
-		    oap->start.col = curbuf->b_op_start_orig.col;
-		    // reset pre_textlen to the value of OP_INSERT
-		    pre_textlen += bd.textlen;
-		    pre_textlen -= t - oap->start_vcol;
-		    oap->start_vcol = t;
-		    oap->op_type = OP_INSERT;
-		}
+		oap->start.col = curbuf->b_op_start_orig.col;
+		pre_textlen -= t - oap->start_vcol;
+		oap->start_vcol = t;
 	    }
-	    else if (bd.is_MAX && oap->op_type == OP_APPEND)
+	    else if (oap->op_type == OP_APPEND
+		    && oap->start.col + oap->start.coladd
+			    >= curbuf->b_op_start_orig.col
+					      + curbuf->b_op_start_orig.coladd)
 	    {
+		oap->start.col = curbuf->b_op_start_orig.col;
 		// reset pre_textlen to the value of OP_INSERT
 		pre_textlen += bd.textlen;
 		pre_textlen -= t - oap->start_vcol;
+		oap->start_vcol = t;
+		oap->op_type = OP_INSERT;
 	    }
 	}
 
diff --git a/src/version.c b/src/version.c
index eca2c748e..559b6022d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4388,
 /**/
     4387,
 /**/