diff --git a/p4src/static-mapping.p4 b/p4src/static-mapping.p4
index 5c9196b..79acc21 100644
--- a/p4src/static-mapping.p4
+++ b/p4src/static-mapping.p4
@@ -33,7 +33,7 @@ control MyIngress(inout headers hdr,
     }
 
     action controller_debug_table_id(table_t table_id) {
-        hdr.cpu.table_id = table_id;
+        meta.table_id = table_id;
         controller_reply(TASK_DEBUG);
     }
 
@@ -129,10 +129,11 @@ control MyIngress(inout headers hdr,
         actions = {
             controller_debug;
             nat64_static;
+            controller_debug_table_id;
             NoAction;
         }
         size = NAT64_TABLE_SIZE;
-        default_action = controller_debug;
+        default_action = controller_debug_table_id(TABLE_NAT64);
     }
 
     table nat46 {
@@ -143,10 +144,11 @@ control MyIngress(inout headers hdr,
         actions = {
             controller_debug;
             nat46_static;
+            controller_debug_table_id;
             NoAction;
         }
         size = NAT64_TABLE_SIZE;
-        default_action = controller_debug;
+        default_action = controller_debug_table_id(TABLE_NAT46);
     }
 
 
@@ -371,7 +373,7 @@ control MyEgress(inout headers hdr,
             hdr.cpu.task = meta.task;
             hdr.cpu.ethertype = hdr.ethernet.ethertype;
             hdr.cpu.ingress_port = (bit<16>) meta.ingress_port;
-
+            hdr.cpu.table_id = meta.table_id;
 
             hdr.ethernet.ethertype = TYPE_CPU;
         }