diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c
index 2756226..d4de8ae 100644
--- a/src/gb/gprs_ns2_sns.c
+++ b/src/gb/gprs_ns2_sns.c
@@ -305,7 +305,7 @@
 				if (nsvc->bind != bind)
 					continue;
 
-				if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_sockaddr(nsvc))) {
+				if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_remote(nsvc))) {
 					found = true;
 					break;
 				}
@@ -340,7 +340,7 @@
 				if (nsvc->bind != bind)
 					continue;
 
-				if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_sockaddr(nsvc))) {
+				if (!osmo_sockaddr_cmp(&remote, gprs_ns2_ip_vc_remote(nsvc))) {
 					found = true;
 					break;
 				}
@@ -508,7 +508,7 @@
 	}
 
 	llist_for_each_entry(nsvc, &nse->nsvc, list) {
-		remote = gprs_ns2_ip_vc_sockaddr(nsvc);
+		remote = gprs_ns2_ip_vc_remote(nsvc);
 		/* all nsvc in NSE should be IP/UDP nsvc */
 		OSMO_ASSERT(remote);
 
@@ -556,7 +556,7 @@
 	}
 
 	llist_for_each_entry_safe(nsvc, tmp, &nse->nsvc, list) {
-		remote = gprs_ns2_ip_vc_sockaddr(nsvc);
+		remote = gprs_ns2_ip_vc_remote(nsvc);
 		/* all nsvc in NSE should be IP/UDP nsvc */
 		OSMO_ASSERT(remote);
 		if (osmo_sockaddr_cmp(&sa, remote))