diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index a45d0ea..c81468c 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1376,6 +1376,7 @@
       assert_equal(1, g:anint / 6)
       assert_equal(2, g:anint
                             / g:thefour)
+      assert_true(1 / 0 > 99999)
 
       assert_equal(5, 11 % 6)
       assert_equal(4, g:anint % 6)
@@ -1383,6 +1384,7 @@
                             g:anint)
       assert_equal(2, g:anint
                             % g:thefour)
+      assert_equal(0, 1 % 0)
 
       assert_equal(4, 6 * 4 / 6)
 
diff --git a/src/version.c b/src/version.c
index 452fa2d..b809cb2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2376,
+/**/
     2375,
 /**/
     2374,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index d1df008..36fd253 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4300,9 +4300,11 @@
 	    {
 		case '*': res = tv1->vval.v_number * tv2->vval.v_number;
 			  break;
-		case '/': res = tv1->vval.v_number / tv2->vval.v_number;
+		case '/': res = num_divide(tv1->vval.v_number,
+							   tv2->vval.v_number);
 			  break;
-		case '%': res = tv1->vval.v_number % tv2->vval.v_number;
+		case '%': res = num_modulus(tv1->vval.v_number,
+							   tv2->vval.v_number);
 			  break;
 	    }
 	    tv1->vval.v_number = res;