diff --git a/p4app/controller.py b/p4app/controller.py
index b714319..707dcec 100644
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -138,7 +138,7 @@ class L2Controller(object):
         if self.cpu_port:
             self.controller.mirroring_add(100, self.cpu_port)
 
-        self.init_ndp()
+#        self.init_ndp()
 
     def config(self):
         self.fill_tables()
@@ -158,7 +158,7 @@ class L2Controller(object):
 
         self.controller.table_clear("v6_addresses")
         for v6addr in self.v6_addresses[self.mode]:
-            self.controller.table_add("v6_addresses", "send_to_controller", [v6addr['addr']])
+            self.controller.table_add("v6_addresses", "controller_reply", [v6addr['addr']])
 
 
     def gen_ndp_multicast_addr(self, addr):
diff --git a/p4src/static-mapping.p4 b/p4src/static-mapping.p4
index 1543843..afc7ba1 100644
--- a/p4src/static-mapping.p4
+++ b/p4src/static-mapping.p4
@@ -138,6 +138,7 @@ control MyIngress(inout headers hdr,
         actions = {
 //			icmp6_answer;
             send_to_controller;
+            controller_reply;
             NoAction;
         }
         size = ADDRESS_TABLE_SIZE;