diff --git a/format.cc b/format.cc
index 77a1ad7d..4190ad25 100644
--- a/format.cc
+++ b/format.cc
@@ -916,7 +916,10 @@ void fmt::internal::PrintfFormatter<Char>::format(
         ArgConverter<short>(arg, *s).visit(arg);
       break;
     case 'l':
-      ArgConverter<long>(arg, *s).visit(arg);
+      if (*s == 'l')
+        ArgConverter<long long>(arg, *++s).visit(arg);
+      else
+        ArgConverter<long>(arg, *s).visit(arg);
       break;
     case 'j':
       ArgConverter<intmax_t>(arg, *s).visit(arg);