diff --git a/core/net/uip-nd6.c b/core/net/uip-nd6.c
index 27553b897..f3134b027 100644
--- a/core/net/uip-nd6.c
+++ b/core/net/uip-nd6.c
@@ -130,9 +130,9 @@ static uip_nd6_opt_llao *nd6_opt_llao;   /**  Pointer to llao option in uip_buf
 #if !UIP_CONF_ROUTER            // TBD see if we move it to ra_input
 static uip_nd6_opt_prefix_info *nd6_opt_prefix_info; /**  Pointer to prefix information option in uip_buf */
 static uip_ipaddr_t ipaddr;
+static uip_ds6_prefix_t *prefix; /**  Pointer to a prefix list entry */
 #endif
 static uip_ds6_nbr_t *nbr; /**  Pointer to a nbr cache entry*/
-static uip_ds6_prefix_t *prefix; /**  Pointer to a prefix list entry */
 static uip_ds6_defrt_t *defrt; /**  Pointer to a router list entry */
 static uip_ds6_addr_t *addr; /**  Pointer to an interface address */
 
@@ -336,7 +336,7 @@ uip_nd6_ns_output(uip_ipaddr_t * src, uip_ipaddr_t * dest, uip_ipaddr_t * tgt)
   UIP_ICMP_BUF->type = ICMP6_NS;
   UIP_ICMP_BUF->icode = 0;
   UIP_ND6_NS_BUF->reserved = 0;
-  uip_ipaddr_copy((uip_ipaddr_t *) & UIP_ND6_NS_BUF->tgtipaddr, tgt);
+  uip_ipaddr_copy((uip_ipaddr_t *) &UIP_ND6_NS_BUF->tgtipaddr, tgt);
   UIP_IP_BUF->len[0] = 0;       /* length will not be more than 255 */
   /*
    * check if we add a SLLAO option: for DAD, MUST NOT, for NUD, MAY