diff --git a/SourceQuery/GoldSourceRcon.php b/SourceQuery/GoldSourceRcon.php
index a9c5ce3..c4168be 100644
--- a/SourceQuery/GoldSourceRcon.php
+++ b/SourceQuery/GoldSourceRcon.php
@@ -69,45 +69,50 @@
 			// GoldSource RCON has same structure as Query
 			$Buffer = $this->Socket->Read( );
 			
-			if( $Buffer->GetByte( ) !== SourceQuery::S2A_RCON )
-			{
-				throw new InvalidPacketException( 'Invalid rcon response.', InvalidPacketException::PACKET_HEADER_MISMATCH );
-			}
-			
-			$Buffer  = $Buffer->Get( );
-			$Trimmed = Trim( $Buffer );
-			
-			if( $Trimmed === 'Bad rcon_password.' )
-			{
-				throw new AuthenticationException( $Trimmed, AuthenticationException::BAD_PASSWORD );
-			}
-			else if( $Trimmed === 'You have been banned from this server.' )
-			{
-				throw new AuthenticationException( $Trimmed, AuthenticationException::BANNED );
-			}
-			
+			$StringBuffer = '';
 			$ReadMore = false;
 			
 			// There is no indentifier of the end, so we just need to continue reading
-			// TODO: Needs to be looked again, it causes timeouts
 			do
 			{
-				$this->Socket->Read( );
-				
-				$ReadMore = $Buffer->Remaining( ) > 0 && $Buffer->GetByte( ) === SourceQuery::S2A_RCON;
+				$ReadMore = $Buffer->Remaining( ) > 0;
 				
 				if( $ReadMore )
 				{
-					$Packet  = $Buffer->Get( );
-					$Buffer .= SubStr( $Packet, 0, -2 );
+					if( $Buffer->GetByte( ) !== SourceQuery::S2A_RCON )
+					{
+						throw new InvalidPacketException( 'Invalid rcon response.', InvalidPacketException::PACKET_HEADER_MISMATCH );
+					}
+					
+					$Packet = $Buffer->Get( );
+					$StringBuffer .= $Packet;
+					//$StringBuffer .= SubStr( $Packet, 0, -2 );
 					
 					// Let's assume if this packet is not long enough, there are no more after this one
 					$ReadMore = StrLen( $Packet ) > 1000; // use 1300?
+					
+					if( $ReadMore )
+					{
+						$Buffer = $this->Socket->Read( );
+					}
 				}
 			}
 			while( $ReadMore );
 			
-			$Buffer->Set( Trim( $Buffer ) );
+			$Trimmed = trim( $StringBuffer );
+			
+			if( $Trimmed === 'Bad rcon_password.' )
+			{
+				throw new AuthenticationException( $Trimmed, AuthenticationException::BAD_PASSWORD );
+			}
+			else if( $Trimmed === 'You have been banned from this server.' )
+			{
+				throw new AuthenticationException( $Trimmed, AuthenticationException::BANNED );
+			}
+			
+			$Buffer->Set( $Trimmed );
+			
+			return $Buffer;
 		}
 		
 		public function Command( $Command )