diff --git a/FMNetwork.cpp b/FMNetwork.cpp
index ffb0d0a..2bfdc8a 100644
--- a/FMNetwork.cpp
+++ b/FMNetwork.cpp
@@ -300,9 +300,16 @@ void CFMNetwork::clock(unsigned int ms)
 		return;
 
 	// Check if the data is for us
-	if (!CUDPSocket::match(addr, m_addr)) {
-		LogMessage("FM packet received from an invalid source");
-		return;
+	if (m_protocol == FMNP_USRP) {
+		if (!CUDPSocket::match(addr, m_addr, IMT_ADDRESS_AND_PORT)) {
+			LogMessage("FM packet received from an invalid source");
+			return;
+		}
+	} else {
+		if (!CUDPSocket::match(addr, m_addr, IMT_ADDRESS_ONLY)) {
+			LogMessage("FM packet received from an invalid source");
+			return;
+		}
 	}
 
 	if (!m_enabled)
diff --git a/Version.h b/Version.h
index 5ff4f06..e8bf195 100644
--- a/Version.h
+++ b/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20231017";
+const char* VERSION = "20231018";
 
 #endif