diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
index 6f0f6bcc..d76aac45 100644
--- a/include/spdlog/details/fmt_helper.h
+++ b/include/spdlog/details/fmt_helper.h
@@ -47,7 +47,7 @@ template<typename T>
 inline unsigned count_digits(T n)
 {
     using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
-    return fmt::internal::count_digits(static_cast<count_type>(n));
+    return static_cast<unsigned>(fmt::internal::count_digits(static_cast<count_type>(n)));
 }
 
 template<size_t Buffer_Size>
diff --git a/include/spdlog/details/pattern_formatter.h b/include/spdlog/details/pattern_formatter.h
index 9bc34a55..e049f78b 100644
--- a/include/spdlog/details/pattern_formatter.h
+++ b/include/spdlog/details/pattern_formatter.h
@@ -712,7 +712,7 @@ public:
         const auto pid = static_cast<uint32_t>(details::os::pid());
         if (padinfo_.enabled())
         {
-            const size_t field_size = fmt::internal::count_digits(pid);
+            auto field_size = fmt_helper::count_digits(pid);
             scoped_pad p(field_size, padinfo_, dest);
             fmt_helper::append_int(pid, dest);
         }
@@ -885,7 +885,7 @@ public:
         }
         if (padinfo_.enabled())
         {
-            const size_t field_size = fmt::internal::count_digits(msg.source.line);
+            auto field_size = fmt_helper::count_digits(msg.source.line);
             scoped_pad p(field_size, padinfo_, dest);
             fmt_helper::append_int(msg.source.line, dest);
         }