diff --git a/Sources/Parsing/ParserPrinters/PrefixThrough.swift b/Sources/Parsing/ParserPrinters/PrefixThrough.swift
index 5c08341b5a..d7db24f823 100644
--- a/Sources/Parsing/ParserPrinters/PrefixThrough.swift
+++ b/Sources/Parsing/ParserPrinters/PrefixThrough.swift
@@ -32,12 +32,11 @@ public struct PrefixThrough<Input: Collection>: Parser where Input.SubSequence =
     let original = input
     while let index = input.firstIndex(where: { self.areEquivalent(first, $0) }) {
       input = input[index...]
-      if input.count >= count,
-        zip(input[index...], self.possibleMatch).allSatisfy(self.areEquivalent)
+      if let matchEndIndex = input.index(index, offsetBy: count, limitedBy: input.endIndex),
+        zip(input[..<matchEndIndex], self.possibleMatch).allSatisfy(self.areEquivalent)
       {
-        let index = input.index(index, offsetBy: count)
-        input = input[index...]
-        return original[..<index]
+        input = input[matchEndIndex...]
+        return original[..<matchEndIndex]
       }
       input.removeFirst()
     }
diff --git a/Sources/Parsing/ParserPrinters/PrefixUpTo.swift b/Sources/Parsing/ParserPrinters/PrefixUpTo.swift
index 6f032417ce..899b459013 100644
--- a/Sources/Parsing/ParserPrinters/PrefixUpTo.swift
+++ b/Sources/Parsing/ParserPrinters/PrefixUpTo.swift
@@ -32,8 +32,8 @@ public struct PrefixUpTo<Input: Collection>: Parser where Input.SubSequence == I
     let original = input
     while let index = input.firstIndex(where: { self.areEquivalent(first, $0) }) {
       input = input[index...]
-      if input.count >= count,
-        zip(input[index...], self.possibleMatch).allSatisfy(self.areEquivalent)
+      if let matchEndIndex = input.index(index, offsetBy: count, limitedBy: input.endIndex),
+        zip(input[..<matchEndIndex], self.possibleMatch).allSatisfy(self.areEquivalent)
       {
         return original[..<index]
       }