diff --git a/UniFi Multi Endpoint Monitor/module.php b/UniFi Multi Endpoint Monitor/module.php
index ef1743f..0cb959e 100644
--- a/UniFi Multi Endpoint Monitor/module.php	
+++ b/UniFi Multi Endpoint Monitor/module.php	
@@ -259,7 +259,7 @@ public function EndpointMonitor()
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data Uptime in hours ").round($Uptime / 3600, 0), 0);
 							}
 
-							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false);
+							if ($this->ReadPropertyBoolean("DataPointConnection") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false);
 							{
 								$Accesspoint = $DeviceFromController["ap_mac"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."Accesspoint"), $Accesspoint);
@@ -283,7 +283,7 @@ public function EndpointMonitor()
 								$this->SetValue($this->GetIDForIdent($DeviceMac."SignalStrength"), $SignalStrength);
 								$this->SendDebug($this->Translate("Endpoint Monitor"), $this->Translate("Connection Data SignalStrength ").$SignalStrength, 0);
 							}
-							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 && $ConnectionType == 0 && $ConnectionConfigError == false)
+							if ($this->ReadPropertyBoolean("DataPointTransfer") == 1 AND $ConnectionType == 0 AND $ConnectionConfigError == false)
 							{
 								$TXBytes = $DeviceFromController["tx_bytes"];
 								$this->SetValue($this->GetIDForIdent($DeviceMac."TXBytes"), $TXBytes / 1000000);