diff --git a/include/fmt/format.h b/include/fmt/format.h
index ddf086f8..7c403bf8 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -1559,7 +1559,7 @@ template <typename OutputIt, typename Char, typename UInt> struct int_writer {
     int num_digits = count_digits(abs_value);
     int size = num_digits, n = num_digits;
     std::string::const_iterator group = groups.cbegin();
-    while (group != groups.cend() && num_digits > *group && *group > 0 &&
+    while (group != groups.cend() && n > *group && *group > 0 &&
            *group != max_value<char>()) {
       size += sep_size;
       n -= *group;
diff --git a/test/locale-test.cc b/test/locale-test.cc
index fcce0091..15a40d99 100644
--- a/test/locale-test.cc
+++ b/test/locale-test.cc
@@ -61,6 +61,7 @@ TEST(LocaleTest, Format) {
 
   std::locale special_grouping_loc(std::locale(), new special_grouping<char>());
   EXPECT_EQ("1,23,45,678", fmt::format(special_grouping_loc, "{:L}", 12345678));
+  EXPECT_EQ("12,345", fmt::format(special_grouping_loc, "{:L}", 12345));
 
   std::locale small_grouping_loc(std::locale(), new small_grouping<char>());
   EXPECT_EQ("4,2,9,4,9,6,7,2,9,5",