diff --git a/src/vnet/fib/fib_sas.c b/src/vnet/fib/fib_sas.c
index 230fcd1..8abac86 100644
--- a/src/vnet/fib/fib_sas.c
+++ b/src/vnet/fib/fib_sas.c
@@ -61,6 +61,18 @@
         d_tmp.ip4 = *dst;
     }
 
+    if (vnet_sw_interface_is_p2p(vnet_get_main(), sw_if_index))
+    {
+        ip4_address_t *ip4;
+        ip4 = ip_interface_get_first_ip (sw_if_index, 1);
+        if (ip4) {
+            src->as_u32 = ip4->as_u32;
+            return (true);
+        } else {
+            return (false);
+        }
+    }
+
     /*
      * If the interface is unnumbered then use the IP interface
      */
@@ -111,6 +123,18 @@
         return (true);
     }
 
+    if (vnet_sw_interface_is_p2p(vnet_get_main(), sw_if_index))
+    {
+        ip6_address_t *ip6;
+        ip6 = ip_interface_get_first_ip (sw_if_index, 0);
+        if (ip6) {
+            ip6_address_copy(src, ip6);
+            return (true);
+        } else {
+            return (false);
+        }
+    }
+
     /*
      * get the source address from the glean adjacency
      */