diff --git a/include/dragonbox/dragonbox.h b/include/dragonbox/dragonbox.h
index af4d345..f1a0ea3 100644
--- a/include/dragonbox/dragonbox.h
+++ b/include/dragonbox/dragonbox.h
@@ -2055,7 +2055,9 @@ namespace jkj::dragonbox {
                 // Using an upper bound on xi, we might be able to optimize the division
                 // better than the compiler; we are computing xi / big_divisor here.
                 ret_value.significand =
-                    div::divide_by_pow10<kappa + 1, significand_bits + kappa + 2, kappa + 1>(xi);
+                    div::divide_by_pow10<kappa + 1, carrier_uint,
+                                         (carrier_uint(1) << (significand_bits + 1)) * big_divisor -
+                                             1>(xi);
                 auto r = std::uint32_t(xi - big_divisor * ret_value.significand);
 
                 if (r != 0) {
@@ -2130,7 +2132,9 @@ namespace jkj::dragonbox {
                 // Using an upper bound on zi, we might be able to optimize the division better than
                 // the compiler; we are computing zi / big_divisor here.
                 ret_value.significand =
-                    div::divide_by_pow10<kappa + 1, significand_bits + kappa + 2, kappa + 1>(zi);
+                    div::divide_by_pow10<kappa + 1, carrier_uint,
+                                         (carrier_uint(1) << (significand_bits + 1)) * big_divisor -
+                                             1>(zi);
                 auto const r = std::uint32_t(zi - big_divisor * ret_value.significand);
 
                 if (r > deltai) {