diff --git a/logot/_match.py b/logot/_match.py
index e5118eed..b4c032c8 100644
--- a/logot/_match.py
+++ b/logot/_match.py
@@ -7,7 +7,7 @@
 
 # Mapping of conversion types to regex matchers.
 _CONVERSION_INT = r"\-?\d+"
-_CONVERSION_STR = r".*"
+_CONVERSION_STR = r".*?"
 _CONVERSION_MAP = {
     # Integer conversion.
     "d": _CONVERSION_INT,
@@ -17,12 +17,12 @@
     "x": r"\-?[\da-f]+",
     "X": r"\-?[\dA-F]+",
     # Float conversion.
-    "e": r"\-?(?:\d+.\d+e[\-\+]+\d{2,3}|inf|nan)",
-    "E": r"\-?(?:\d+.\d+E[\-\+]+\d{2,3}|INF|NAN)",
-    "f": r"\-?(?:\d+.\d+|inf|nan)",
-    "F": r"\-?(?:\d+.\d+|INF|NAN)",
-    "g": r"\-?(?:\d+(?:.\d+|)(?:e[\-\+]+\d{2,3}|)|inf|nan)",
-    "G": r"\-?(?:\d+(?:.\d+|)(?:E[\-\+]+\d{2,3}|)|INF|NAN)",
+    "e": r"\-?(?:\d+\.\d+e[\-\+]\d{2,3}|inf|nan)",
+    "E": r"\-?(?:\d+\.\d+E[\-\+]\d{2,3}|INF|NAN)",
+    "f": r"\-?(?:\d+\.\d+|inf|nan)",
+    "F": r"\-?(?:\d+\.\d+|INF|NAN)",
+    "g": r"\-?(?:\d+(?:\.\d+)?(?:e[\-\+]\d{2,3})?|inf|nan)",
+    "G": r"\-?(?:\d+(?:\.\d+)?(?:E[\-\+]\d{2,3})?|INF|NAN)",
     # Character conversion.
     "c": r".",
     # String conversion.