diff --git a/modules/fstream/main.py b/modules/fstream/main.py
index dcf9aba..834370b 100644
--- a/modules/fstream/main.py
+++ b/modules/fstream/main.py
@@ -124,7 +124,11 @@ def clientLoopIn(self):
 				setClientData(self.cID,"bufferPacket",packet)
 				with clientsLock:
 					for cID in clients:
-						if getClientData(cID,"type") == "watch" and getClientData(cID,"args")["user"] == args["user"] and getClientData(cID,"args")["channel"] == args["channel"] and getClientData(cID,"args")["channel_password"] == args["channel_password"]:
+						if (
+							getClientData(cID,"type") == "watch" and
+							getClientData(cID,"args")["user"] == args["user"] and
+							getClientData(cID,"args")["channel"] == args["channel"]
+						):
 							getClientData(cID,"queue").put("")
 	
 	if cmd[0] == "watch":
@@ -134,7 +138,12 @@ def clientLoopIn(self):
 		with clientDataLock:
 			with clientsLock:
 				for cID in clients:
-					if getClientData(cID,"args")["user"] == args["user"] and getClientData(cID,"type") == "broadcast":
+					if (
+						getClientData(cID,"type") == "broadcast" and
+						getClientData(cID,"args")["user"] == args["user"] and
+						getClientData(cID,"args")["channel"] == args["channel"] and
+						getClientData(cID,"args")["channel_password"] == args["channel_password"]
+					):
 						watchID = cID
 						packet = getClientData(cID,"bufferPacket")