diff --git a/StreamCenter/Helpers/Extensions/String.swift b/StreamCenter/Helpers/Extensions/String.swift
index a0becf3..f235a28 100644
--- a/StreamCenter/Helpers/Extensions/String.swift
+++ b/StreamCenter/Helpers/Extensions/String.swift
@@ -56,7 +56,7 @@ extension String {
         return self[from..<end]
     }
     func substring(_ from: Int, length: Int) -> String {
-        let end = from + length
+        let end = from + length + 1
         return self[from..<end]
     }
 }
diff --git a/StreamCenter/TwitchAPI/Chat/TwitchChatManager.swift b/StreamCenter/TwitchAPI/Chat/TwitchChatManager.swift
index 8313436..ca7fdbd 100644
--- a/StreamCenter/TwitchAPI/Chat/TwitchChatManager.swift
+++ b/StreamCenter/TwitchAPI/Chat/TwitchChatManager.swift
@@ -44,7 +44,7 @@ class TwitchChatManager {
     func joinTwitchChannel(_ channel : TwitchChannel) {
         let dispatchTime: DispatchTime = DispatchTime.now() + Double(Int64(3 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)
         DispatchQueue.main.asyncAfter(deadline: dispatchTime, execute: {
-            self.connection?.sendStringMessage("JOIN #\(channel.name)", immediately: true)
+            self.connection?.sendStringMessage("JOIN #\(channel.name!)", immediately: true)
         })
     }