diff --git a/p4app/controller.py b/p4app/controller.py
index 73c8a78..6cdb209 100644
--- a/p4app/controller.py
+++ b/p4app/controller.py
@@ -173,8 +173,8 @@ class L2Controller(object):
         for v6addr in self.v6_addresses[self.mode]:
             icmp6_addr = self.gen_ndp_multicast_addr(v6addr)
 
-            self.controller.table_add("v6_addresses", "controller_reply", [str(self.task['ICMP6_GENERAL'])], [str(v6addr)])
-            self.controller.table_add("v6_addresses", "controller_reply", [str(self.task['ICMP6_NS'])], [str(icmp6_addr)])
+            self.controller.table_add("v6_addresses", "controller_reply", [str(v6addr)], [str(self.task['ICMP6_GENERAL'])])
+            self.controller.table_add("v6_addresses", "controller_reply", [str(icmp6_addr)], [str(self.task['ICMP6_NS'])])
 
     def config_hosts(self):
         """ Assumptions: