1 files changed, 4 insertions, 8 deletions
diff --git a/src/numeric.c b/src/numeric.c
index b8e207a74..7a4da2153 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -1119,15 +1119,11 @@ int_mod(mrb_state *mrb, mrb_value x)
 
   a = mrb_integer(x);
   if (mrb_integer_p(y) && a != MRB_INT_MIN && (b=mrb_integer(y)) != MRB_INT_MIN) {
-    mrb_int mod;
-
-    if (a >= 0 && b >= 0) {
-      mod = a % b;
-    }
-    else {
-      fixdivmod(mrb, a, b, NULL, &mod);
+    mrb_int mod = a % b;
+    if ((a < 0) != (b < 0) && mod != 0) {
+      mod += b;
     }
-    return mrb_fixnum_value(mod);
+    return mrb_int_value(mrb, mod);
   }
 #ifdef MRB_NO_FLOAT
   mrb_raise(mrb, E_TYPE_ERROR, "non integer modulo");