diff --git a/src/draw_target.rs b/src/draw_target.rs
index 75e07425..378fe68f 100644
--- a/src/draw_target.rs
+++ b/src/draw_target.rs
@@ -333,18 +333,27 @@ impl RateLimiter {
         }
 
         let elapsed = now - self.prev;
-        let remaining = (MAX_BURST - self.capacity) as u128;
-        self.capacity += Ord::min(remaining, elapsed.as_millis() / self.interval as u128) as u8;
-        let interval_nanos = self.interval as u128 * 1_000_000;
-        self.prev = now - Duration::from_nanos((elapsed.as_nanos() % interval_nanos) as u64);
-
-        match self.capacity.checked_sub(1) {
-            Some(new) => {
-                self.capacity = new;
-                true
-            }
-            None => false,
+        // If `capacity` is 0 and not enough time (`self.interval` ms) has passed since
+        // `self.prev` to add new capacity, return `false`. The goal of this method is to
+        // make this decision as efficient as possible.
+        if self.capacity == 0 && elapsed < Duration::from_millis(self.interval as u64) {
+            return false;
         }
+
+        // We now calculate `new`, the number of ms, since we last returned `true`,
+        // and `remainder`, which represents a number of ns less than 1ms which we cannot
+        // convert into capacity now, so we're saving it for later.
+        let (new, remainder) = (
+            elapsed.as_millis() / self.interval as u128,
+            elapsed.as_nanos() % self.interval as u128 * 1_000_000,
+        );
+
+        // We add `new` to `capacity`, subtract one for returning `true` from here,
+        // then make sure it does not exceed a maximum of `MAX_BURST`, then store it.
+        self.capacity = Ord::min(MAX_BURST, self.capacity + new as u8 - 1);
+        // Store `prev` for the next iteration after subtracting the `remainder`.
+        self.prev = now - Duration::from_nanos(remainder as u64);
+        true
     }
 }
 
diff --git a/src/state.rs b/src/state.rs
index 9cd0d60a..10396eb3 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -395,13 +395,17 @@ pub(crate) struct AtomicPosition {
 
 impl AtomicPosition {
     pub(crate) fn allow(&self, now: Instant) -> bool {
+        if now < self.start {
+            return false;
+        }
+
         let mut capacity = self.capacity.load(Ordering::Acquire);
         // `prev` is the number of ms after `self.started` we last returned `true`, in ns
         let prev = self.prev.load(Ordering::Acquire);
         // `elapsed` is the number of ns since `self.started`
         let elapsed = (now - self.start).as_nanos() as u64;
         // `diff` is the number of ns since we last returned `true`
-        let diff = elapsed - prev;
+        let diff = elapsed.saturating_sub(prev);
 
         // If `capacity` is 0 and not enough time (1ms) has passed since `prev`
         // to add new capacity, return `false`. The goal of this method is to
@@ -427,7 +431,7 @@ impl AtomicPosition {
 
     fn reset(&self, now: Instant) {
         self.set(0);
-        let elapsed = (now - self.start).as_millis() as u64;
+        let elapsed = (now.saturating_duration_since(self.start)).as_millis() as u64;
         self.prev.store(elapsed, Ordering::Release);
     }