diff --git a/Source/SocketIO/Parse/SocketParsable.swift b/Source/SocketIO/Parse/SocketParsable.swift
index b0a9e30..5763e35 100644
--- a/Source/SocketIO/Parse/SocketParsable.swift
+++ b/Source/SocketIO/Parse/SocketParsable.swift
@@ -119,7 +119,7 @@ public extension SocketParsable where Self: SocketManagerSpec & SocketDataBuffer
             }
         }
 
-        var dataArray = String(message.utf16[message.utf16.index(reader.currentIndex, offsetBy: 1)..<message.utf16.endIndex])!
+        var dataArray = String(message.utf16[message.utf16.index(reader.currentIndex, offsetBy: 1)...])!
 
         if type == .error && !dataArray.hasPrefix("[") && !dataArray.hasSuffix("]") {
             dataArray = "[" + dataArray + "]"
diff --git a/Source/SocketIO/Util/SocketStringReader.swift b/Source/SocketIO/Util/SocketStringReader.swift
index 6ae19e2..0a74344 100644
--- a/Source/SocketIO/Util/SocketStringReader.swift
+++ b/Source/SocketIO/Util/SocketStringReader.swift
@@ -54,7 +54,7 @@ struct SocketStringReader {
     }
 
     mutating func readUntilOccurence(of string: String) -> String {
-        let substring = message.utf16[currentIndex..<message.utf16.endIndex]
+        let substring = message.utf16[currentIndex...]
 
         guard let foundIndex = substring.index(of: string.utf16.first!) else {
             currentIndex = message.utf16.endIndex