diff --git pdns/auth-main.cc pdns/auth-main.cc
index 6e2e1717a..307a3d504 100644
--- pdns/auth-main.cc
+++ pdns/auth-main.cc
@@ -603,13 +603,11 @@ try {
       diff = question.d_dt.udiffNoReset();
       receive_latency = 0.999 * receive_latency + 0.001 * std::max(diff, 0);
 
       numreceived++;
 
-      accountremote = question.d_remote;
-      if (question.d_inner_remote)
-        accountremote = *question.d_inner_remote;
+      accountremote = question.getInnerRemote();
 
       if (accountremote.sin4.sin_family == AF_INET)
         numreceived4++;
       else
         numreceived6++;
diff --git pdns/tcpreceiver.cc pdns/tcpreceiver.cc
index 22b002bb5..9ab62eb20 100644
--- pdns/tcpreceiver.cc
+++ pdns/tcpreceiver.cc
@@ -391,11 +391,11 @@ void TCPNameserver::doConnection(int fd)
 
       if (PC.enabled()) {
         if (packet->couldBeCached()) {
           std::string view{};
           if (g_views) {
-            Netmask netmask(packet->d_remote);
+            Netmask netmask(packet->getInnerRemote());
             view = g_zoneCache.getViewFromNetwork(&netmask);
           }
           if (PC.get(*packet, *cached, view)) { // short circuit - does the PacketCache recognize this question?
             if(logDNSQueries) {
               g_log<<": packetcache HIT"<<endl;