diff --git a/src/core/raw.c b/src/core/raw.c
index b2c4d09c..651ae73a 100644
--- a/src/core/raw.c
+++ b/src/core/raw.c
@@ -434,7 +434,6 @@ raw_new_ip6(u8_t proto)
   struct raw_pcb *pcb;
   pcb = raw_new(proto);
 #if LWIP_IPV4
-  ip_set_v6(pcb, 1);
   IP_SET_TYPE_VAL(pcb->local_ip, IPADDR_TYPE_V6);
   IP_SET_TYPE_VAL(pcb->remote_ip, IPADDR_TYPE_V6);
 #endif /* LWIP_IPV4 */
diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c
index bbef5770..c500b832 100644
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -308,7 +308,7 @@ static err_t pppol2tp_connect(ppp_pcb *ppp, void *ctx) {
    * because the L2TP LNS might answer with its own random source port (!= 1701)
    */
 #if LWIP_IPV6
-  if (PCB_ISIPV6(l2tp->udp)) {
+  if (IP_IS_V6_VAL(l2tp->udp->local_ip)) {
     udp_bind(l2tp->udp, IP6_ADDR_ANY, 0);
   } else
 #endif /* LWIP_IPV6 */