diff --git a/src/normal.c b/src/normal.c
index 16b4b45..61a19c1 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2563,12 +2563,11 @@
 	    n /= 10;
 	else if (VIM_ISDIGIT(nchar))
 	{
-	    if (n > LONG_MAX / 10)
+	    if (vim_append_digit_long(&n, nchar - '0') == FAIL)
 	    {
 		clearopbeep(cap->oap);
 		break;
 	    }
-	    n = n * 10 + (nchar - '0');
 	}
 	else if (nchar == CAR)
 	{